equal
deleted
inserted
replaced
553 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
553 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
554 $ echo J > J |
554 $ echo J > J |
555 $ hg add J |
555 $ hg add J |
556 $ hg commit -m J |
556 $ hg commit -m J |
557 $ hg debugobsolete `hg log --rev . -T '{node}'` |
557 $ hg debugobsolete `hg log --rev . -T '{node}'` |
|
558 obsoleted 1 changesets |
558 |
559 |
559 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
560 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
560 rebasing 9:4bde274eefcf "I" |
561 rebasing 9:4bde274eefcf "I" |
561 rebasing 13:06edfc82198f "J" (tip) |
562 rebasing 13:06edfc82198f "J" (tip) |
562 $ hg log -G |
563 $ hg log -G |
708 o 2:261e70097290 B2 |
709 o 2:261e70097290 B2 |
709 | |
710 | |
710 o 0:4a2df7238c3b A |
711 o 0:4a2df7238c3b A |
711 |
712 |
712 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all |
713 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all |
|
714 obsoleted 1 changesets |
713 $ hg rebase -d 6 -r "4::" |
715 $ hg rebase -d 6 -r "4::" |
714 rebasing 4:ff2c4d47b71d "C" |
716 rebasing 4:ff2c4d47b71d "C" |
715 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
717 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
716 rebasing 8:8d47583e023f "P" (tip) |
718 rebasing 8:8d47583e023f "P" (tip) |
717 |
719 |
735 $ echo "non-relevant change" > nonrelevant |
737 $ echo "non-relevant change" > nonrelevant |
736 $ hg add nonrelevant |
738 $ hg add nonrelevant |
737 $ hg commit -m nonrelevant |
739 $ hg commit -m nonrelevant |
738 created new head |
740 created new head |
739 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all |
741 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all |
|
742 obsoleted 1 changesets |
740 $ hg rebase -r . -d 10 |
743 $ hg rebase -r . -d 10 |
741 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
744 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
742 |
745 |
743 If a rebase is going to create divergence, it should abort |
746 If a rebase is going to create divergence, it should abort |
744 |
747 |
859 $ hg commit -m "dummy change" |
862 $ hg commit -m "dummy change" |
860 $ printf "dummy" > L |
863 $ printf "dummy" > L |
861 $ hg add L |
864 $ hg add L |
862 $ hg commit -m "dummy change" |
865 $ hg commit -m "dummy change" |
863 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all |
866 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all |
|
867 obsoleted 1 changesets |
864 |
868 |
865 $ hg log -G -r 17:: |
869 $ hg log -G -r 17:: |
866 @ 22:7bdc8a87673d dummy change |
870 @ 22:7bdc8a87673d dummy change |
867 | |
871 | |
868 x 21:8b31da3c4919 dummy change |
872 x 21:8b31da3c4919 dummy change |