691 $ hg resolve -m |
691 $ hg resolve -m |
692 (no more unresolved files) |
692 (no more unresolved files) |
693 continue: hg evolve --continue |
693 continue: hg evolve --continue |
694 |
694 |
695 $ hg evolve --continue |
695 $ hg evolve --continue |
696 working directory is now at 10c9f94f1e99 |
696 evolving 23:3f7a1f693080 "added z" |
697 |
697 updating to "local" side of the conflict: 53242575ffa9 |
698 $ hg glog |
698 merging "other" content-divergent changeset 'cdb0643c69fc' |
699 @ 26:10c9f94f1e99 added z |
699 transaction abort! |
700 | () [default] draft |
700 rollback completed |
701 o 21:7bbcf24ddecf added y |
701 ** Unknown exception encountered with possibly-broken third-party extension evolve |
|
702 ** which supports versions 4.6 of Mercurial. |
|
703 ** Please disable evolve and try your action again. |
|
704 ** If that fixes the bug please report it to https://bz.mercurial-scm.org/ |
|
705 ** Python 2.7.12 (default, Dec 4 2017, 14:50:18) [GCC 5.4.0 20160609] |
|
706 ** Mercurial Distributed SCM (version 4.7rc0+2-10d40c83205b) |
|
707 ** Extensions loaded: rebase, evolve |
|
708 Traceback (most recent call last): |
|
709 File "/tmp/hgtests.rpfl6k/install/bin/hg", line 41, in <module> |
|
710 dispatch.run() |
|
711 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 90, in run |
|
712 status = dispatch(req) |
|
713 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 213, in dispatch |
|
714 ret = _runcatch(req) or 0 |
|
715 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 354, in _runcatch |
|
716 return _callcatch(ui, _runcatchfunc) |
|
717 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 362, in _callcatch |
|
718 return scmutil.callcatch(ui, func) |
|
719 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/scmutil.py", line 161, in callcatch |
|
720 return func() |
|
721 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 344, in _runcatchfunc |
|
722 return _dispatch(req) |
|
723 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 984, in _dispatch |
|
724 cmdpats, cmdoptions) |
|
725 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 730, in runcommand |
|
726 ret = _runcommand(ui, options, cmd, d) |
|
727 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 992, in _runcommand |
|
728 return cmdfunc() |
|
729 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 981, in <lambda> |
|
730 d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) |
|
731 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/util.py", line 1528, in check |
|
732 return func(*args, **kwargs) |
|
733 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1519, in evolve |
|
734 continueevolve(ui, repo, evolvestate, progresscb) |
|
735 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1706, in continueevolve |
|
736 _continuecontentdivergent(ui, repo, evolvestate, progresscb) |
|
737 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1752, in _continuecontentdivergent |
|
738 evolvestate) |
|
739 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 512, in _mergecontentdivergents |
|
740 mergeancestor=True) |
|
741 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 2052, in update |
|
742 followcopies, matcher=matcher, mergeforce=mergeforce) |
|
743 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 1337, in calculateupdates |
|
744 acceptremote, followcopies) |
|
745 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 1138, in manifestmerge |
|
746 ret = copies.mergecopies(repo, wctx, p2, pa) |
|
747 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/copies.py", line 383, in mergecopies |
|
748 return _fullcopytracing(repo, c1, c2, base) |
|
749 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/copies.py", line 537, in _fullcopytracing |
|
750 assert not both2['incomplete'] |
|
751 AssertionError |
|
752 [1] |
|
753 |
|
754 $ hg diff |
|
755 diff -r 7bbcf24ddecf z |
|
756 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
757 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
|
758 @@ -0,0 +1,1 @@ |
|
759 +bar |
|
760 |
|
761 $ echo foo > y |
|
762 $ hg resolve -m |
|
763 abort: resolve command not applicable when not merging |
|
764 [255] |
|
765 $ hg evolve --continue |
|
766 evolving 23:3f7a1f693080 "added z" |
|
767 updating to "local" side of the conflict: 53242575ffa9 |
|
768 merging "other" content-divergent changeset '4954f28e111b' |
|
769 transaction abort! |
|
770 rollback completed |
|
771 ** Unknown exception encountered with possibly-broken third-party extension evolve |
|
772 ** which supports versions 4.6 of Mercurial. |
|
773 ** Please disable evolve and try your action again. |
|
774 ** If that fixes the bug please report it to https://bz.mercurial-scm.org/ |
|
775 ** Python 2.7.12 (default, Dec 4 2017, 14:50:18) [GCC 5.4.0 20160609] |
|
776 ** Mercurial Distributed SCM (version 4.7rc0+2-10d40c83205b) |
|
777 ** Extensions loaded: rebase, evolve |
|
778 Traceback (most recent call last): |
|
779 File "/tmp/hgtests.rpfl6k/install/bin/hg", line 41, in <module> |
|
780 dispatch.run() |
|
781 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 90, in run |
|
782 status = dispatch(req) |
|
783 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 213, in dispatch |
|
784 ret = _runcatch(req) or 0 |
|
785 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 354, in _runcatch |
|
786 return _callcatch(ui, _runcatchfunc) |
|
787 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 362, in _callcatch |
|
788 return scmutil.callcatch(ui, func) |
|
789 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/scmutil.py", line 161, in callcatch |
|
790 return func() |
|
791 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 344, in _runcatchfunc |
|
792 return _dispatch(req) |
|
793 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 984, in _dispatch |
|
794 cmdpats, cmdoptions) |
|
795 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 730, in runcommand |
|
796 ret = _runcommand(ui, options, cmd, d) |
|
797 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 992, in _runcommand |
|
798 return cmdfunc() |
|
799 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/dispatch.py", line 981, in <lambda> |
|
800 d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) |
|
801 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/util.py", line 1528, in check |
|
802 return func(*args, **kwargs) |
|
803 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1519, in evolve |
|
804 continueevolve(ui, repo, evolvestate, progresscb) |
|
805 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1706, in continueevolve |
|
806 _continuecontentdivergent(ui, repo, evolvestate, progresscb) |
|
807 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 1752, in _continuecontentdivergent |
|
808 evolvestate) |
|
809 File "/home/foobar/repo/mutable-history/hgext3rd/evolve/evolvecmd.py", line 512, in _mergecontentdivergents |
|
810 mergeancestor=True) |
|
811 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 2052, in update |
|
812 followcopies, matcher=matcher, mergeforce=mergeforce) |
|
813 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 1337, in calculateupdates |
|
814 acceptremote, followcopies) |
|
815 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/merge.py", line 1138, in manifestmerge |
|
816 ret = copies.mergecopies(repo, wctx, p2, pa) |
|
817 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/copies.py", line 383, in mergecopies |
|
818 return _fullcopytracing(repo, c1, c2, base) |
|
819 File "/tmp/hgtests.rpfl6k/install/lib/python/mercurial/copies.py", line 537, in _fullcopytracing |
|
820 assert not both2['incomplete'] |
|
821 AssertionError |
|
822 [1] |
|
823 |
|
824 $ hg glog |
|
825 * 25:53242575ffa9 added z |
702 | () [bar] draft |
826 | () [bar] draft |
703 o 15:b006cf317e0e added foo to x |
827 | * 23:3f7a1f693080 added z |
704 | () [bar] draft |
828 | | () [default] draft |
705 o 10:4ae4427ee9f8 added d |
829 @ | 21:7bbcf24ddecf added y |
706 | () [default] draft |
830 | | () [bar] draft |
707 o 9:917281f93fcb added c |
831 o | 15:b006cf317e0e added foo to x |
708 | () [default] draft |
832 | | () [bar] draft |
|
833 o | 10:4ae4427ee9f8 added d |
|
834 | | () [default] draft |
|
835 o | 9:917281f93fcb added c |
|
836 |/ () [default] draft |
709 o 8:171614c9a791 added b |
837 o 8:171614c9a791 added b |
710 | () [default] draft |
838 | () [default] draft |
711 o 1:c7586e2a9264 added a |
839 o 1:c7586e2a9264 added a |
712 | () [default] draft |
840 | () [default] draft |
713 o 0:8fa14d15e168 added hgignore |
841 o 0:8fa14d15e168 added hgignore |
714 () [default] draft |
842 () [default] draft |
715 |
843 |
716 XXX: z should have bar inside, the merge definitely did not happen |
|
717 $ hg exp |
844 $ hg exp |
718 # HG changeset patch |
845 # HG changeset patch |
719 # User test |
846 # User test |
720 # Date 0 0 |
847 # Date 0 0 |
721 # Thu Jan 01 00:00:00 1970 +0000 |
848 # Thu Jan 01 00:00:00 1970 +0000 |
722 # Node ID 10c9f94f1e9902d905b22019d711d31f3642f589 |
849 # Branch bar |
723 # Parent 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
850 # Node ID 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
724 added z |
851 # Parent b006cf317e0ed16dbe786c439577475580f645f1 |
|
852 added y |
725 |
853 |
726 diff -r 7bbcf24ddecf -r 10c9f94f1e99 y |
854 diff -r b006cf317e0e -r 7bbcf24ddecf y |
727 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
855 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
728 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
856 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
729 @@ -1,1 +1,1 @@ |
|
730 -watbar |
|
731 +foo |
|
732 diff -r 7bbcf24ddecf -r 10c9f94f1e99 z |
|
733 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
734 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
|
735 @@ -0,0 +1,1 @@ |
857 @@ -0,0 +1,1 @@ |
736 +z |
858 +watbar |
737 |
859 |
738 $ cd .. |
860 $ cd .. |
739 |
861 |
740 Resolving content-divergence of a stack with same parents |
862 Resolving content-divergence of a stack with same parents |
741 --------------------------------------------------------- |
863 --------------------------------------------------------- |