equal
deleted
inserted
replaced
733 |/ |
733 |/ |
734 o 2:261e70097290 B2 |
734 o 2:261e70097290 B2 |
735 | |
735 | |
736 o 0:4a2df7238c3b A |
736 o 0:4a2df7238c3b A |
737 |
737 |
738 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all |
738 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true |
739 obsoleted 1 changesets |
739 obsoleted 1 changesets |
740 $ hg rebase -d 6 -r "4::" |
740 $ hg rebase -d 6 -r "4::" |
741 rebasing 4:ff2c4d47b71d "C" |
741 rebasing 4:ff2c4d47b71d "C" |
742 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
742 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
743 rebasing 8:8d47583e023f "P" (tip) |
743 rebasing 8:8d47583e023f "P" (tip) |
761 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
761 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
762 $ echo "non-relevant change" > nonrelevant |
762 $ echo "non-relevant change" > nonrelevant |
763 $ hg add nonrelevant |
763 $ hg add nonrelevant |
764 $ hg commit -m nonrelevant |
764 $ hg commit -m nonrelevant |
765 created new head |
765 created new head |
766 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all |
766 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true |
767 obsoleted 1 changesets |
767 obsoleted 1 changesets |
768 $ hg rebase -r . -d 10 |
768 $ hg rebase -r . -d 10 |
769 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
769 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
770 |
770 |
771 If a rebase is going to create divergence, it should abort |
771 If a rebase is going to create divergence, it should abort |
884 $ hg add K |
884 $ hg add K |
885 $ hg commit -m "dummy change" |
885 $ hg commit -m "dummy change" |
886 $ printf "dummy" > L |
886 $ printf "dummy" > L |
887 $ hg add L |
887 $ hg add L |
888 $ hg commit -m "dummy change" |
888 $ hg commit -m "dummy change" |
889 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.stabilization=all |
889 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true |
890 obsoleted 1 changesets |
890 obsoleted 1 changesets |
891 |
891 |
892 $ hg log -G -r 16:: |
892 $ hg log -G -r 16:: |
893 @ 21:7bdc8a87673d dummy change |
893 @ 21:7bdc8a87673d dummy change |
894 | |
894 | |
1203 |
1203 |
1204 Test that bookmark is moved and working dir is updated when all changesets have |
1204 Test that bookmark is moved and working dir is updated when all changesets have |
1205 equivalents in destination |
1205 equivalents in destination |
1206 $ hg init rbsrepo && cd rbsrepo |
1206 $ hg init rbsrepo && cd rbsrepo |
1207 $ echo "[experimental]" > .hg/hgrc |
1207 $ echo "[experimental]" > .hg/hgrc |
1208 $ echo "stabilization=all" >> .hg/hgrc |
1208 $ echo "evolution=true" >> .hg/hgrc |
1209 $ echo "rebaseskipobsolete=on" >> .hg/hgrc |
1209 $ echo "rebaseskipobsolete=on" >> .hg/hgrc |
1210 $ echo root > root && hg ci -Am root |
1210 $ echo root > root && hg ci -Am root |
1211 adding root |
1211 adding root |
1212 $ echo a > a && hg ci -Am a |
1212 $ echo a > a && hg ci -Am a |
1213 adding a |
1213 adding a |