812 |
812 |
813 $ hg resolve -m |
813 $ hg resolve -m |
814 (no more unresolved files) |
814 (no more unresolved files) |
815 continue: hg evolve --continue |
815 continue: hg evolve --continue |
816 |
816 |
817 XXX: we should handle this correctly here, this is not phase-divergence |
|
818 resolution happening |
|
819 |
|
820 $ hg evolve --continue |
817 $ hg evolve --continue |
821 continuing interrupted 'phasedivergent' resolution is not yet supported |
818 evolving 19:5fd38c0de46e "added l to l" |
822 working directory is now at 8c2bb6fb44e9 |
819 computing new diff |
823 |
820 committed as e3090241a10c |
824 $ hg glog |
821 working directory is now at e3090241a10c |
825 * 19:5fd38c0de46e added l to l |
822 |
|
823 $ hg glog |
|
824 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: |
826 | () draft |
825 | () draft |
827 | o 17:f3794e5a91dc added l to l |
826 o 17:f3794e5a91dc added l to l |
828 | | () public |
827 | () public |
829 | @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
828 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
830 | | () public |
829 | () public |
831 | o 12:dc88f5aa9bc9 y to y and foobar to foo |
830 o 12:dc88f5aa9bc9 y to y and foobar to foo |
832 | | () public |
831 | () public |
833 | o 9:2352021b3785 added x to x |
832 o 9:2352021b3785 added x to x |
834 |/ (bm) public |
833 | (bm) public |
835 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
834 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
836 | () public |
835 | () public |
837 o 6:b756eb10ea73 added bar to bar |
836 o 6:b756eb10ea73 added bar to bar |
838 | () public |
837 | () public |
839 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |
838 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |
842 | () public |
841 | () public |
843 o 1:4d1169d82e47 modify a |
842 o 1:4d1169d82e47 modify a |
844 | () public |
843 | () public |
845 o 0:d3873e73d99e init |
844 o 0:d3873e73d99e init |
846 () public |
845 () public |
|
846 |
|
847 $ hg exp |
|
848 # HG changeset patch |
|
849 # User test |
|
850 # Date 0 0 |
|
851 # Thu Jan 01 00:00:00 1970 +0000 |
|
852 # Node ID e3090241a10c320b6132e4673915fd6b19c0de39 |
|
853 # Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48 |
|
854 phase-divergent update to f3794e5a91dc: |
|
855 |
|
856 added l to l |
|
857 |
|
858 diff -r f3794e5a91dc -r e3090241a10c l |
|
859 --- a/l Thu Jan 01 00:00:00 1970 +0000 |
|
860 +++ b/l Thu Jan 01 00:00:00 1970 +0000 |
|
861 @@ -1,1 +1,1 @@ |
|
862 -l |
|
863 +kl |
|
864 diff -r f3794e5a91dc -r e3090241a10c x |
|
865 --- a/x Thu Jan 01 00:00:00 1970 +0000 |
|
866 +++ b/x Thu Jan 01 00:00:00 1970 +0000 |
|
867 @@ -1,1 +1,1 @@ |
|
868 -x |
|
869 +foo |