equal
deleted
inserted
replaced
808 +foo |
808 +foo |
809 +>>>>>>> evolving: 5fd38c0de46e - test: added l to l |
809 +>>>>>>> evolving: 5fd38c0de46e - test: added l to l |
810 |
810 |
811 $ echo foo > x |
811 $ echo foo > x |
812 |
812 |
813 XXX: we should suggest graft --continue here |
|
814 $ hg resolve -m |
813 $ hg resolve -m |
815 (no more unresolved files) |
814 (no more unresolved files) |
816 continue: hg graft --continue |
815 continue: hg evolve --continue |
817 |
816 |
818 XXX: we should handle this correctly here |
817 XXX: we should handle this correctly here, this is not phase-divergence |
|
818 resolution happening |
|
819 |
819 $ hg evolve --continue |
820 $ hg evolve --continue |
820 abort: no interrupted evolve to continue |
821 evolving 19:5fd38c0de46e "added l to l" |
821 [255] |
822 working directory is now at 2598cf6ceb65 |
|
823 |
|
824 $ hg glog |
|
825 @ 20:2598cf6ceb65 added l to l |
|
826 | () draft |
|
827 | o 17:f3794e5a91dc added l to l |
|
828 |/ () public |
|
829 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
|
830 | () public |
|
831 o 12:dc88f5aa9bc9 y to y and foobar to foo |
|
832 | () public |
|
833 o 9:2352021b3785 added x to x |
|
834 | (bm) public |
|
835 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
|
836 | () public |
|
837 o 6:b756eb10ea73 added bar to bar |
|
838 | () public |
|
839 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |
|
840 | () public |
|
841 o 3:aa071e5554e3 added foo to foo |
|
842 | () public |
|
843 o 1:4d1169d82e47 modify a |
|
844 | () public |
|
845 o 0:d3873e73d99e init |
|
846 () public |