equal
deleted
inserted
replaced
83 $ hg evolve --all |
83 $ hg evolve --all |
84 move:[4] added d |
84 move:[4] added d |
85 atop:[5] added c |
85 atop:[5] added c |
86 merging d |
86 merging d |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
88 fix conflicts and see `hg help evolve.interrupted` |
88 unresolved merge conflicts |
|
89 (see 'hg help evolve.interrupted') |
89 [1] |
90 [1] |
90 |
91 |
91 $ hg parents |
92 $ hg parents |
92 changeset: 5:e93a9161a274 |
93 changeset: 5:e93a9161a274 |
93 tag: tip |
94 tag: tip |
130 $ hg evolve --all --update |
131 $ hg evolve --all --update |
131 move:[4] added d |
132 move:[4] added d |
132 atop:[5] added c |
133 atop:[5] added c |
133 merging d |
134 merging d |
134 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
135 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
135 fix conflicts and see `hg help evolve.interrupted` |
136 unresolved merge conflicts |
|
137 (see 'hg help evolve.interrupted') |
136 [1] |
138 [1] |
137 $ echo foo > d |
139 $ echo foo > d |
138 $ hg resolve -m |
140 $ hg resolve -m |
139 (no more unresolved files) |
141 (no more unresolved files) |
140 continue: hg evolve --continue |
142 continue: hg evolve --continue |
157 move:[2] added b |
159 move:[2] added b |
158 atop:[7] added a |
160 atop:[7] added a |
159 move:[5] added c |
161 move:[5] added c |
160 merging c |
162 merging c |
161 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
163 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
162 fix conflicts and see `hg help evolve.interrupted` |
164 unresolved merge conflicts |
|
165 (see 'hg help evolve.interrupted') |
163 [1] |
166 [1] |
164 |
167 |
165 testing that interrupted evolve shows up in morestatus |
168 testing that interrupted evolve shows up in morestatus |
166 $ hg status -v |
169 $ hg status -v |
167 M c |
170 M c |
268 atop:[7] added a |
271 atop:[7] added a |
269 move:[6] foo to a |
272 move:[6] foo to a |
270 atop:[7] added a |
273 atop:[7] added a |
271 merging a |
274 merging a |
272 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
275 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
273 fix conflicts and see `hg help evolve.interrupted` |
276 unresolved merge conflicts |
|
277 (see 'hg help evolve.interrupted') |
274 [1] |
278 [1] |
275 |
279 |
276 $ hg glog |
280 $ hg glog |
277 o 9:7f8e8bd9f0b6 added c |
281 o 9:7f8e8bd9f0b6 added c |
278 | () draft |
282 | () draft |
332 atop:[7] added a |
336 atop:[7] added a |
333 move:[6] foo to a |
337 move:[6] foo to a |
334 atop:[7] added a |
338 atop:[7] added a |
335 merging a |
339 merging a |
336 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
340 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
337 fix conflicts and see `hg help evolve.interrupted` |
341 unresolved merge conflicts |
|
342 (see 'hg help evolve.interrupted') |
338 [1] |
343 [1] |
339 $ hg glog |
344 $ hg glog |
340 o 9:7f8e8bd9f0b6 added c |
345 o 9:7f8e8bd9f0b6 added c |
341 | () draft |
346 | () draft |
342 | o 8:db3b42ef4da7 added b |
347 | o 8:db3b42ef4da7 added b |
409 atop:[9] added c |
414 atop:[9] added c |
410 move:[6] foo to a |
415 move:[6] foo to a |
411 atop:[7] added a |
416 atop:[7] added a |
412 merging a |
417 merging a |
413 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
418 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
414 fix conflicts and see `hg help evolve.interrupted` |
419 unresolved merge conflicts |
|
420 (see 'hg help evolve.interrupted') |
415 [1] |
421 [1] |
416 |
422 |
417 $ hg glog |
423 $ hg glog |
418 o 12:1c476940790a added d |
424 o 12:1c476940790a added d |
419 | () draft |
425 | () draft |
484 move:[2] added b |
490 move:[2] added b |
485 atop:[4] added a |
491 atop:[4] added a |
486 move:[3] added c |
492 move:[3] added c |
487 merging c |
493 merging c |
488 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
494 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
489 fix conflicts and see `hg help evolve.interrupted` |
495 unresolved merge conflicts |
|
496 (see 'hg help evolve.interrupted') |
490 [1] |
497 [1] |
491 |
498 |
492 $ hg glog |
499 $ hg glog |
493 @ 5:c1f4718020e3 added b |
500 @ 5:c1f4718020e3 added b |
494 | (bm1) draft |
501 | (bm1) draft |
530 $ hg next --evolve |
537 $ hg next --evolve |
531 move:[3] added c |
538 move:[3] added c |
532 atop:[5] added b |
539 atop:[5] added b |
533 merging c |
540 merging c |
534 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
541 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
535 fix conflicts and see `hg help evolve.interrupted` |
542 unresolved merge conflicts |
|
543 (see 'hg help evolve.interrupted') |
536 [1] |
544 [1] |
537 |
545 |
538 $ hg evolve --abort |
546 $ hg evolve --abort |
539 evolve aborted |
547 evolve aborted |
540 working directory is now at c1f4718020e3 |
548 working directory is now at c1f4718020e3 |