equal
deleted
inserted
replaced
824 update: 2 new changesets, 3 branch heads (merge) |
824 update: 2 new changesets, 3 branch heads (merge) |
825 phases: 8 draft |
825 phases: 8 draft |
826 orphan: 1 changesets |
826 orphan: 1 changesets |
827 $ hg rebase -s 10 -d 12 |
827 $ hg rebase -s 10 -d 12 |
828 abort: this rebase will cause divergences from: 121d9e3bc4c6 |
828 abort: this rebase will cause divergences from: 121d9e3bc4c6 |
829 (to force the rebase please set experimental.allowdivergence=True) |
829 (to force the rebase please set experimental.evolution.allowdivergence=True) |
830 [255] |
830 [255] |
831 $ hg log -G |
831 $ hg log -G |
832 @ 14:73568ab6879d bar foo |
832 @ 14:73568ab6879d bar foo |
833 | |
833 | |
834 | o 13:77d874d096a2 10' |
834 | o 13:77d874d096a2 10' |
843 | |
843 | |
844 o 2:261e70097290 B2 |
844 o 2:261e70097290 B2 |
845 | |
845 | |
846 o 0:4a2df7238c3b A |
846 o 0:4a2df7238c3b A |
847 |
847 |
848 With experimental.allowdivergence=True, rebase can create divergence |
848 With experimental.evolution.allowdivergence=True, rebase can create divergence |
849 |
849 |
850 $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True |
850 $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True |
851 rebasing 10:121d9e3bc4c6 "P" |
851 rebasing 10:121d9e3bc4c6 "P" |
852 rebasing 14:73568ab6879d "bar foo" (tip) |
852 rebasing 14:73568ab6879d "bar foo" (tip) |
853 $ hg summary |
853 $ hg summary |
854 parent: 16:61bd55f69bc4 tip |
854 parent: 16:61bd55f69bc4 tip |
855 bar foo |
855 bar foo |