equal
deleted
inserted
replaced
91 $ norevtest 'none clean linear' clean 4 |
91 $ norevtest 'none clean linear' clean 4 |
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 parent=5 |
93 parent=5 |
94 |
94 |
95 $ norevtest 'none clean same' clean 2 |
95 $ norevtest 'none clean same' clean 2 |
96 abort: not a linear update |
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
97 (merge or update --check to force update) |
97 1 other heads for branch "default" |
98 parent=2 |
98 parent=2 |
99 |
99 |
100 |
100 |
101 $ revtest 'none clean linear' clean 1 2 |
101 $ revtest 'none clean linear' clean 1 2 |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
138 (commit or update --clean to discard changes) |
138 (commit or update --clean to discard changes) |
139 parent=3 |
139 parent=3 |
140 M foo |
140 M foo |
141 |
141 |
142 $ norevtest 'none dirty cross' dirty 2 |
142 $ norevtest 'none dirty cross' dirty 2 |
143 abort: uncommitted changes |
143 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
144 (commit and merge, or update --clean to discard changes) |
144 1 other heads for branch "default" |
145 parent=2 |
145 parent=2 |
146 M foo |
146 M foo |
147 |
147 |
148 $ revtest 'none dirtysub cross' dirtysub 3 4 |
148 $ revtest 'none dirtysub cross' dirtysub 3 4 |
149 abort: uncommitted changes |
149 abort: uncommitted changes |
164 abort: uncommitted changes in subrepository 'sub' |
164 abort: uncommitted changes in subrepository 'sub' |
165 parent=1 |
165 parent=1 |
166 M sub/suba |
166 M sub/suba |
167 |
167 |
168 $ norevtest '-c clean same' clean 2 -c |
168 $ norevtest '-c clean same' clean 2 -c |
169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 1 other heads for branch "default" |
170 1 other heads for branch "default" |
171 parent=3 |
171 parent=2 |
172 |
172 |
173 $ revtest '-cC dirty linear' dirty 1 2 -cC |
173 $ revtest '-cC dirty linear' dirty 1 2 -cC |
174 abort: cannot specify both -c/--check and -C/--clean |
174 abort: cannot specify both -c/--check and -C/--clean |
175 parent=1 |
175 parent=1 |
176 M foo |
176 M foo |