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 fix conflicts and see `hg help evolve.interrupted` |
61 unresolved merge conflicts |
|
62 (see 'hg help evolve.interrupted') |
62 [1] |
63 [1] |
63 |
64 |
64 $ echo foo > d |
65 $ echo foo > d |
65 $ hg resolve -m |
66 $ hg resolve -m |
66 (no more unresolved files) |
67 (no more unresolved files) |
116 $ hg evolve --update |
117 $ hg evolve --update |
117 move:[7] added e |
118 move:[7] added e |
118 atop:[8] added d |
119 atop:[8] added d |
119 merging e |
120 merging e |
120 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
121 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
121 fix conflicts and see `hg help evolve.interrupted` |
122 unresolved merge conflicts |
|
123 (see 'hg help evolve.interrupted') |
122 [1] |
124 [1] |
123 |
125 |
124 $ echo bar > e |
126 $ echo bar > e |
125 $ hg resolve -m |
127 $ hg resolve -m |
126 (no more unresolved files) |
128 (no more unresolved files) |
156 $ hg evolve --all --update |
158 $ hg evolve --all --update |
157 move:[2] added b |
159 move:[2] added b |
158 atop:[9] added a |
160 atop:[9] added a |
159 merging b |
161 merging b |
160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
162 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
161 fix conflicts and see `hg help evolve.interrupted` |
163 unresolved merge conflicts |
|
164 (see 'hg help evolve.interrupted') |
162 [1] |
165 [1] |
163 |
166 |
164 $ echo foo > b |
167 $ echo foo > b |
165 $ hg resolve -m |
168 $ hg resolve -m |
166 (no more unresolved files) |
169 (no more unresolved files) |
240 move:[12] added d |
243 move:[12] added d |
241 atop:[16] added c |
244 atop:[16] added c |
242 move:[13] added f |
245 move:[13] added f |
243 merging f |
246 merging f |
244 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
247 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
245 fix conflicts and see `hg help evolve.interrupted` |
248 unresolved merge conflicts |
|
249 (see 'hg help evolve.interrupted') |
246 [1] |
250 [1] |
247 |
251 |
248 $ echo foo > f |
252 $ echo foo > f |
249 $ hg resolve -m |
253 $ hg resolve -m |
250 (no more unresolved files) |
254 (no more unresolved files) |
254 move:[14] added g |
258 move:[14] added g |
255 atop:[18] added f |
259 atop:[18] added f |
256 move:[15] added h |
260 move:[15] added h |
257 merging h |
261 merging h |
258 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
262 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
259 fix conflicts and see `hg help evolve.interrupted` |
263 unresolved merge conflicts |
|
264 (see 'hg help evolve.interrupted') |
260 [1] |
265 [1] |
261 |
266 |
262 $ echo foo > h |
267 $ echo foo > h |
263 $ hg resolve -m |
268 $ hg resolve -m |
264 (no more unresolved files) |
269 (no more unresolved files) |
300 move:[19] added g |
305 move:[19] added g |
301 atop:[21] added f |
306 atop:[21] added f |
302 perform evolve? [Ny] y |
307 perform evolve? [Ny] y |
303 merging g |
308 merging g |
304 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
309 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
305 fix conflicts and see `hg help evolve.interrupted` |
310 unresolved merge conflicts |
|
311 (see 'hg help evolve.interrupted') |
306 [1] |
312 [1] |
307 |
313 |
308 $ echo foo > g |
314 $ echo foo > g |
309 $ hg resolve -m |
315 $ hg resolve -m |
310 (no more unresolved files) |
316 (no more unresolved files) |
348 $ hg next --evolve |
354 $ hg next --evolve |
349 move:[22] added g |
355 move:[22] added g |
350 atop:[24] added f |
356 atop:[24] added f |
351 merging g |
357 merging g |
352 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
358 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
353 fix conflicts and see `hg help evolve.interrupted` |
359 unresolved merge conflicts |
|
360 (see 'hg help evolve.interrupted') |
354 [1] |
361 [1] |
355 $ echo foo > g |
362 $ echo foo > g |
356 $ hg resolve -m |
363 $ hg resolve -m |
357 (no more unresolved files) |
364 (no more unresolved files) |
358 continue: hg evolve --continue |
365 continue: hg evolve --continue |
414 $ hg evolve |
421 $ hg evolve |
415 move:[3] added d, modified c |
422 move:[3] added d, modified c |
416 atop:[5] added c |
423 atop:[5] added c |
417 merging c |
424 merging c |
418 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
425 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
419 fix conflicts and see `hg help evolve.interrupted` |
426 unresolved merge conflicts |
|
427 (see 'hg help evolve.interrupted') |
420 [1] |
428 [1] |
421 |
429 |
422 Status mentions file 'b' (copied from 'a') here, even though it wasn't |
430 Status mentions file 'b' (copied from 'a') here, even though it wasn't |
423 affected by the evolved changeset (nor was 'a') |
431 affected by the evolved changeset (nor was 'a') |
424 |
432 |