equal
deleted
inserted
replaced
534 | | |
534 | | |
535 | o 15:2d66e189f5b5 add cM |
535 | o 15:2d66e189f5b5 add cM |
536 |/ |
536 |/ |
537 o 14:d66ccb8c5871 add cL |
537 o 14:d66ccb8c5871 add cL |
538 | |
538 | |
|
539 ~ |
539 $ hg strip -r 210589181b14 |
540 $ hg strip -r 210589181b14 |
540 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
541 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
541 working directory now at d66ccb8c5871 |
542 working directory now at d66ccb8c5871 |
542 2 changesets pruned |
543 2 changesets pruned |
543 |
544 |
555 | | |
556 | | |
556 | o 15:2d66e189f5b5 add cM |
557 | o 15:2d66e189f5b5 add cM |
557 |/ |
558 |/ |
558 o 14:d66ccb8c5871 add cL |
559 o 14:d66ccb8c5871 add cL |
559 | |
560 | |
|
561 ~ |
560 |
562 |
561 Test prunestrip |
563 Test prunestrip |
562 |
564 |
563 $ hg book foo -r 104eed5354c7 |
565 $ hg book foo -r 104eed5354c7 |
564 $ hg strip -r 210589181b14 |
566 $ hg strip -r 210589181b14 |
570 | |
572 | |
571 o 15:2d66e189f5b5 add cM |
573 o 15:2d66e189f5b5 add cM |
572 | |
574 | |
573 @ 14:d66ccb8c5871 add cL foo |
575 @ 14:d66ccb8c5871 add cL foo |
574 | |
576 | |
|
577 ~ |
575 |
578 |
576 Check that --hidden used with inhibit does not hide every obsolete commit |
579 Check that --hidden used with inhibit does not hide every obsolete commit |
577 We show the log before and after a log -G --hidden, they should be the same |
580 We show the log before and after a log -G --hidden, they should be the same |
578 $ hg log -G |
581 $ hg log -G |
579 o 16:a438c045eb37 add cN |
582 o 16:a438c045eb37 add cN |
801 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase |
804 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase |
802 it. We expect to not see the stack at the end of the rebase. |
805 it. We expect to not see the stack at the end of the rebase. |
803 $ hg log -G -r "25::" |
806 $ hg log -G -r "25::" |
804 @ 25:71eb4f100663 add pk |
807 @ 25:71eb4f100663 add pk |
805 | |
808 | |
|
809 ~ |
806 $ hg up -C 22 |
810 $ hg up -C 22 |
807 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
811 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
808 $ mkcommit Dk |
812 $ mkcommit Dk |
809 $ hg prune 22 -s 25 |
813 $ hg prune 22 -s 25 |
810 1 changesets pruned |
814 1 changesets pruned |
814 $ hg log -G -r "25::" |
818 $ hg log -G -r "25::" |
815 @ 27:1192fa9fbc68 add Dk |
819 @ 27:1192fa9fbc68 add Dk |
816 | |
820 | |
817 o 25:71eb4f100663 add pk |
821 o 25:71eb4f100663 add pk |
818 | |
822 | |
|
823 ~ |
819 |
824 |
820 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). |
825 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). |
821 Rebase the first two revs of the stack onto dest, we expect to see one new |
826 Rebase the first two revs of the stack onto dest, we expect to see one new |
822 revision on the destination and everything visible. |
827 revision on the destination and everything visible. |
823 $ hg up 25 |
828 $ hg up 25 |
835 | |
840 | |
836 | o 27:1192fa9fbc68 add Dk |
841 | o 27:1192fa9fbc68 add Dk |
837 |/ |
842 |/ |
838 o 25:71eb4f100663 add pk |
843 o 25:71eb4f100663 add pk |
839 | |
844 | |
|
845 ~ |
840 $ hg prune 28 -s 27 |
846 $ hg prune 28 -s 27 |
841 1 changesets pruned |
847 1 changesets pruned |
842 $ hg up 25 |
848 $ hg up 25 |
843 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
849 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
844 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
850 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
855 | | |
861 | | |
856 o | 27:1192fa9fbc68 add Dk |
862 o | 27:1192fa9fbc68 add Dk |
857 |/ |
863 |/ |
858 @ 25:71eb4f100663 add pk |
864 @ 25:71eb4f100663 add pk |
859 | |
865 | |
|
866 ~ |
860 |
867 |
861 Rebase the same stack in full on the destination, we expect it to disappear |
868 Rebase the same stack in full on the destination, we expect it to disappear |
862 and only see the top revision added to destination. We don\'t expect 29 to be |
869 and only see the top revision added to destination. We don\'t expect 29 to be |
863 skipped as we used --keep before. |
870 skipped as we used --keep before. |
864 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
871 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
872 | |
879 | |
873 o 27:1192fa9fbc68 add Dk |
880 o 27:1192fa9fbc68 add Dk |
874 | |
881 | |
875 @ 25:71eb4f100663 add pk |
882 @ 25:71eb4f100663 add pk |
876 | |
883 | |
|
884 ~ |
877 |
885 |
878 Pulling from a inhibit repo to a non-inhibit repo should work |
886 Pulling from a inhibit repo to a non-inhibit repo should work |
879 |
887 |
880 $ cd .. |
888 $ cd .. |
881 $ hg clone -q inhibit not-inhibit |
889 $ hg clone -q inhibit not-inhibit |