equal
deleted
inserted
replaced
88 |
88 |
89 $ hg evolve --content-divergent --any |
89 $ hg evolve --content-divergent --any |
90 merge:[4] added c |
90 merge:[4] added c |
91 with: [3] added ch |
91 with: [3] added ch |
92 base: [2] added c |
92 base: [2] added c |
93 merging "other" content-divergent changeset '90522bccf499' |
|
94 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499 |
94 other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499 |
96 content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499 |
95 content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499 |
97 |
96 |
98 $ hg evolve -l |
97 $ hg evolve -l |
181 $ hg evolve --content-divergent --any |
180 $ hg evolve --content-divergent --any |
182 merge:[5] added d |
181 merge:[5] added d |
183 with: [4] added dh |
182 with: [4] added dh |
184 base: [3] added d |
183 base: [3] added d |
185 rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be |
184 rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be |
186 updating to "local" side of the conflict: e800202333a4 |
|
187 merging "other" content-divergent changeset 'ae3429430ef1' |
|
188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
185 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189 other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1 |
186 other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1 |
190 content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1 |
187 content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1 |
191 |
188 |
192 $ hg evolve -l |
189 $ hg evolve -l |
267 |
264 |
268 $ hg evolve --content-divergent --any |
265 $ hg evolve --content-divergent --any |
269 merge:[4] added c |
266 merge:[4] added c |
270 with: [3] added ch |
267 with: [3] added ch |
271 base: [2] added c |
268 base: [2] added c |
272 merging "other" content-divergent changeset '229da2719b19' |
|
273 merging ch |
269 merging ch |
274 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') |
270 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') |
275 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
271 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
276 fix conflicts and see `hg help evolve.interrupted` |
272 fix conflicts and see `hg help evolve.interrupted` |
277 [1] |
273 [1] |
395 (no more unresolved files) |
391 (no more unresolved files) |
396 continue: hg evolve --continue |
392 continue: hg evolve --continue |
397 |
393 |
398 $ hg evolve --continue |
394 $ hg evolve --continue |
399 evolving 4:f89a8e2f86ac "added dh" |
395 evolving 4:f89a8e2f86ac "added dh" |
400 updating to "local" side of the conflict: e800202333a4 |
|
401 merging "other" content-divergent changeset 'bc309da55b88' |
|
402 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
396 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
403 other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 |
397 other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 |
404 working directory is now at e800202333a4 |
398 working directory is now at e800202333a4 |
405 |
399 |
406 $ hg evolve -l |
400 $ hg evolve -l |
489 $ hg evolve --content-divergent --any |
483 $ hg evolve --content-divergent --any |
490 merge:[5] added d |
484 merge:[5] added d |
491 with: [4] added dh |
485 with: [4] added dh |
492 base: [3] added d |
486 base: [3] added d |
493 rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be |
487 rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be |
494 updating to "local" side of the conflict: e800202333a4 |
|
495 merging "other" content-divergent changeset 'a5bbf2042450' |
|
496 merging dh |
488 merging dh |
497 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
489 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
498 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
490 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
499 fix conflicts and see `hg help evolve.interrupted` |
491 fix conflicts and see `hg help evolve.interrupted` |
500 [1] |
492 [1] |
607 (no more unresolved files) |
599 (no more unresolved files) |
608 continue: hg evolve --continue |
600 continue: hg evolve --continue |
609 |
601 |
610 $ hg evolve --continue |
602 $ hg evolve --continue |
611 evolving 4:67b19bbd770f "added dh" |
603 evolving 4:67b19bbd770f "added dh" |
612 updating to "local" side of the conflict: e800202333a4 |
|
613 merging "other" content-divergent changeset '09054d1f3c97' |
|
614 merging dh |
604 merging dh |
615 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
605 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
616 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
606 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
617 fix conflicts and see `hg help evolve.interrupted` |
607 fix conflicts and see `hg help evolve.interrupted` |
618 [1] |
608 [1] |
695 |
685 |
696 $ hg evolve --content-divergent |
686 $ hg evolve --content-divergent |
697 merge:[5] added d |
687 merge:[5] added d |
698 with: [6] closing feature branch |
688 with: [6] closing feature branch |
699 base: [3] added d |
689 base: [3] added d |
700 updating to "local" side of the conflict: 497d0d2b90ba |
|
701 merging "other" content-divergent changeset 'af442315d198' |
|
702 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
690 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
703 other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198 |
691 other divergent changeset af442315d198 is a closed branch head and differs from local 497d0d2b90ba by "branch, description" only, discarding af442315d198 |
704 content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198 |
692 content divergence resolution between 497d0d2b90ba (public) and af442315d198 has same content as 497d0d2b90ba, discarding af442315d198 |
705 working directory is now at 497d0d2b90ba |
693 working directory is now at 497d0d2b90ba |
706 |
694 |