equal
deleted
inserted
replaced
649 $ echo J > J |
649 $ echo J > J |
650 $ hg add J |
650 $ hg add J |
651 $ hg commit -m J |
651 $ hg commit -m J |
652 1 new orphan changesets |
652 1 new orphan changesets |
653 $ hg debugobsolete `hg log --rev . -T '{node}'` |
653 $ hg debugobsolete `hg log --rev . -T '{node}'` |
|
654 1 new obsolescence markers |
654 obsoleted 1 changesets |
655 obsoleted 1 changesets |
655 |
656 |
656 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
657 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
657 rebasing 9:4bde274eefcf "I" |
658 rebasing 9:4bde274eefcf "I" |
658 rebasing 13:06edfc82198f "J" (tip) |
659 rebasing 13:06edfc82198f "J" (tip) |
836 o 2:261e70097290 B2 |
837 o 2:261e70097290 B2 |
837 | |
838 | |
838 o 0:4a2df7238c3b A |
839 o 0:4a2df7238c3b A |
839 |
840 |
840 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true |
841 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true |
|
842 1 new obsolescence markers |
841 obsoleted 1 changesets |
843 obsoleted 1 changesets |
842 1 new orphan changesets |
844 1 new orphan changesets |
843 $ hg rebase -d 6 -r "4::" |
845 $ hg rebase -d 6 -r "4::" |
844 rebasing 4:ff2c4d47b71d "C" |
846 rebasing 4:ff2c4d47b71d "C" |
845 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
847 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
865 $ echo "non-relevant change" > nonrelevant |
867 $ echo "non-relevant change" > nonrelevant |
866 $ hg add nonrelevant |
868 $ hg add nonrelevant |
867 $ hg commit -m nonrelevant |
869 $ hg commit -m nonrelevant |
868 created new head |
870 created new head |
869 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true |
871 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true |
|
872 1 new obsolescence markers |
870 obsoleted 1 changesets |
873 obsoleted 1 changesets |
871 $ hg log -G |
874 $ hg log -G |
872 @ 11:f44da1f4954c nonrelevant (pruned) |
875 @ 11:f44da1f4954c nonrelevant (pruned) |
873 | |
876 | |
874 | o 10:121d9e3bc4c6 P |
877 | o 10:121d9e3bc4c6 P |
1005 $ hg commit -m "dummy change" |
1008 $ hg commit -m "dummy change" |
1006 $ printf "dummy" > L |
1009 $ printf "dummy" > L |
1007 $ hg add L |
1010 $ hg add L |
1008 $ hg commit -m "dummy change" |
1011 $ hg commit -m "dummy change" |
1009 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true |
1012 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true |
|
1013 1 new obsolescence markers |
1010 obsoleted 1 changesets |
1014 obsoleted 1 changesets |
1011 1 new orphan changesets |
1015 1 new orphan changesets |
1012 |
1016 |
1013 $ hg log -G -r 16:: |
1017 $ hg log -G -r 16:: |
1014 @ 21:7bdc8a87673d dummy change |
1018 @ 21:7bdc8a87673d dummy change |
1274 > | |
1278 > | |
1275 > a |
1279 > a |
1276 > EOF |
1280 > EOF |
1277 1 new orphan changesets |
1281 1 new orphan changesets |
1278 $ hg debugobsolete `hg log -T "{node}" --hidden -r 'desc("c1")'` |
1282 $ hg debugobsolete `hg log -T "{node}" --hidden -r 'desc("c1")'` |
|
1283 1 new obsolescence markers |
1279 obsoleted 1 changesets |
1284 obsoleted 1 changesets |
1280 $ hg log -G -r 'a': --hidden |
1285 $ hg log -G -r 'a': --hidden |
1281 * 4:76be324c128b d |
1286 * 4:76be324c128b d |
1282 | |
1287 | |
1283 | x 3:ef8a456de8fa c1 (pruned) |
1288 | x 3:ef8a456de8fa c1 (pruned) |