equal
deleted
inserted
replaced
56 $ hg evolve --all |
56 $ hg evolve --all |
57 move:[4] added d |
57 move:[4] added d |
58 atop:[5] added c |
58 atop:[5] added c |
59 merging d |
59 merging d |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
61 abort: fix conflicts and see `hg help evolve.interrupted` |
61 fix conflicts and see `hg help evolve.interrupted` |
62 [255] |
62 [1] |
63 |
63 |
64 $ echo foo > d |
64 $ echo foo > d |
65 $ hg resolve -m |
65 $ hg resolve -m |
66 (no more unresolved files) |
66 (no more unresolved files) |
67 continue: hg evolve --continue |
67 continue: hg evolve --continue |
113 $ hg evolve |
113 $ hg evolve |
114 move:[7] added e |
114 move:[7] added e |
115 atop:[8] added d |
115 atop:[8] added d |
116 merging e |
116 merging e |
117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
118 abort: fix conflicts and see `hg help evolve.interrupted` |
118 fix conflicts and see `hg help evolve.interrupted` |
119 [255] |
119 [1] |
120 |
120 |
121 $ echo bar > e |
121 $ echo bar > e |
122 $ hg resolve -m |
122 $ hg resolve -m |
123 (no more unresolved files) |
123 (no more unresolved files) |
124 continue: hg evolve --continue |
124 continue: hg evolve --continue |
152 $ hg evolve --all |
152 $ hg evolve --all |
153 move:[2] added b |
153 move:[2] added b |
154 atop:[9] added a |
154 atop:[9] added a |
155 merging b |
155 merging b |
156 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
156 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
157 abort: fix conflicts and see `hg help evolve.interrupted` |
157 fix conflicts and see `hg help evolve.interrupted` |
158 [255] |
158 [1] |
159 |
159 |
160 $ echo foo > b |
160 $ echo foo > b |
161 $ hg resolve -m |
161 $ hg resolve -m |
162 (no more unresolved files) |
162 (no more unresolved files) |
163 continue: hg evolve --continue |
163 continue: hg evolve --continue |
238 atop:[16] added c |
238 atop:[16] added c |
239 move:[13] added f |
239 move:[13] added f |
240 atop:[17] added d |
240 atop:[17] added d |
241 merging f |
241 merging f |
242 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
242 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
243 abort: fix conflicts and see `hg help evolve.interrupted` |
243 fix conflicts and see `hg help evolve.interrupted` |
244 [255] |
244 [1] |
245 |
245 |
246 $ echo foo > f |
246 $ echo foo > f |
247 $ hg resolve -m |
247 $ hg resolve -m |
248 (no more unresolved files) |
248 (no more unresolved files) |
249 continue: hg evolve --continue |
249 continue: hg evolve --continue |
253 atop:[18] added f |
253 atop:[18] added f |
254 move:[15] added h |
254 move:[15] added h |
255 atop:[19] added g |
255 atop:[19] added g |
256 merging h |
256 merging h |
257 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
257 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
258 abort: fix conflicts and see `hg help evolve.interrupted` |
258 fix conflicts and see `hg help evolve.interrupted` |
259 [255] |
259 [1] |
260 |
260 |
261 $ echo foo > h |
261 $ echo foo > h |
262 $ hg resolve -m |
262 $ hg resolve -m |
263 (no more unresolved files) |
263 (no more unresolved files) |
264 continue: hg evolve --continue |
264 continue: hg evolve --continue |
299 move:[19] added g |
299 move:[19] added g |
300 atop:[21] added f |
300 atop:[21] added f |
301 perform evolve? [Ny] y |
301 perform evolve? [Ny] y |
302 merging g |
302 merging g |
303 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
303 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
304 abort: fix conflicts and see `hg help evolve.interrupted` |
304 fix conflicts and see `hg help evolve.interrupted` |
305 [255] |
305 [1] |
306 |
306 |
307 $ echo foo > g |
307 $ echo foo > g |
308 $ hg resolve -m |
308 $ hg resolve -m |
309 (no more unresolved files) |
309 (no more unresolved files) |
310 continue: hg evolve --continue |
310 continue: hg evolve --continue |
349 $ hg next --evolve |
349 $ hg next --evolve |
350 move:[22] added g |
350 move:[22] added g |
351 atop:[24] added f |
351 atop:[24] added f |
352 merging g |
352 merging g |
353 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
354 abort: fix conflicts and see `hg help evolve.interrupted` |
354 fix conflicts and see `hg help evolve.interrupted` |
355 [255] |
355 [1] |
356 $ echo foo > g |
356 $ echo foo > g |
357 $ hg resolve -m |
357 $ hg resolve -m |
358 (no more unresolved files) |
358 (no more unresolved files) |
359 continue: hg evolve --continue |
359 continue: hg evolve --continue |
360 $ hg evolve --continue |
360 $ hg evolve --continue |