691 (no more unresolved files) |
691 (no more unresolved files) |
692 continue: hg evolve --continue |
692 continue: hg evolve --continue |
693 |
693 |
694 $ hg evolve --continue |
694 $ hg evolve --continue |
695 evolving 23:3f7a1f693080 "added z" |
695 evolving 23:3f7a1f693080 "added z" |
696 updating to "local" side of the conflict: 53242575ffa9 |
696 updating to "local" side of the conflict: 3f7a1f693080 |
697 merging "other" content-divergent changeset 'cdb0643c69fc' |
697 merging "other" content-divergent changeset 'cdb0643c69fc' |
698 merging y |
698 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
699 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
699 working directory is now at 10c9f94f1e99 |
700 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
701 fix conflicts and see `hg help evolve.interrupted` |
|
702 [1] |
|
703 |
700 |
704 $ hg diff |
701 $ hg diff |
705 diff -r 53242575ffa9 y |
|
706 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
|
707 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
708 @@ -1,1 +1,5 @@ |
|
709 +<<<<<<< local: 53242575ffa9 bar - test: added z |
|
710 watbar |
|
711 +======= |
|
712 +foo |
|
713 +>>>>>>> other: cdb0643c69fc - test: added z |
|
714 |
702 |
715 $ echo foo > y |
703 $ echo foo > y |
716 $ hg resolve -m |
704 $ hg resolve -m |
717 (no more unresolved files) |
705 abort: resolve command not applicable when not merging |
718 continue: hg evolve --continue |
706 [255] |
719 $ hg evolve --continue |
707 $ hg evolve --continue |
720 working directory is now at 6fc7d9682de6 |
708 abort: no interrupted evolve to continue |
721 |
709 [255] |
722 $ hg glog |
710 |
723 @ 27:6fc7d9682de6 added z |
711 $ hg glog |
724 | () [bar] draft |
712 @ 27:10c9f94f1e99 added z |
|
713 | () [default] draft |
|
714 | * 25:53242575ffa9 added z |
|
715 |/ () [bar] draft |
725 o 21:7bbcf24ddecf added y |
716 o 21:7bbcf24ddecf added y |
726 | () [bar] draft |
717 | () [bar] draft |
727 o 15:b006cf317e0e added foo to x |
718 o 15:b006cf317e0e added foo to x |
728 | () [bar] draft |
719 | () [bar] draft |
729 o 10:4ae4427ee9f8 added d |
720 o 10:4ae4427ee9f8 added d |
740 $ hg exp |
731 $ hg exp |
741 # HG changeset patch |
732 # HG changeset patch |
742 # User test |
733 # User test |
743 # Date 0 0 |
734 # Date 0 0 |
744 # Thu Jan 01 00:00:00 1970 +0000 |
735 # Thu Jan 01 00:00:00 1970 +0000 |
745 # Branch bar |
736 # Node ID 10c9f94f1e9902d905b22019d711d31f3642f589 |
746 # Node ID 6fc7d9682de6e3bee6c8b1266b756ed7d522b7e4 |
|
747 # Parent 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
737 # Parent 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
748 added z |
738 added z |
749 |
739 |
750 diff -r 7bbcf24ddecf -r 6fc7d9682de6 y |
740 diff -r 7bbcf24ddecf -r 10c9f94f1e99 y |
751 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
741 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
752 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
742 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
753 @@ -1,1 +1,1 @@ |
743 @@ -1,1 +1,1 @@ |
754 -watbar |
744 -watbar |
755 +foo |
745 +foo |
756 diff -r 7bbcf24ddecf -r 6fc7d9682de6 z |
746 diff -r 7bbcf24ddecf -r 10c9f94f1e99 z |
757 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
747 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
758 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
748 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
759 @@ -0,0 +1,1 @@ |
749 @@ -0,0 +1,1 @@ |
760 +bar |
750 +z |
761 |
751 |
762 $ cd .. |
752 $ cd .. |
763 |
753 |
764 Resolving content-divergence of a stack with same parents |
754 Resolving content-divergence of a stack with same parents |
765 --------------------------------------------------------- |
755 --------------------------------------------------------- |