equal
deleted
inserted
replaced
549 | | |
549 | | |
550 | o 15:2d66e189f5b5 add cM |
550 | o 15:2d66e189f5b5 add cM |
551 |/ |
551 |/ |
552 o 14:d66ccb8c5871 add cL |
552 o 14:d66ccb8c5871 add cL |
553 | |
553 | |
554 ~ |
|
555 $ hg strip -r 210589181b14 |
554 $ hg strip -r 210589181b14 |
556 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
555 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
557 working directory now at d66ccb8c5871 |
556 working directory now at d66ccb8c5871 |
558 2 changesets pruned |
557 2 changesets pruned |
559 |
558 |
571 | | |
570 | | |
572 | o 15:2d66e189f5b5 add cM |
571 | o 15:2d66e189f5b5 add cM |
573 |/ |
572 |/ |
574 o 14:d66ccb8c5871 add cL |
573 o 14:d66ccb8c5871 add cL |
575 | |
574 | |
576 ~ |
|
577 |
575 |
578 Test prunestrip |
576 Test prunestrip |
579 |
577 |
580 $ hg book foo -r 104eed5354c7 |
578 $ hg book foo -r 104eed5354c7 |
581 $ hg strip -r 210589181b14 |
579 $ hg strip -r 210589181b14 |
587 | |
585 | |
588 o 15:2d66e189f5b5 add cM |
586 o 15:2d66e189f5b5 add cM |
589 | |
587 | |
590 @ 14:d66ccb8c5871 add cL foo |
588 @ 14:d66ccb8c5871 add cL foo |
591 | |
589 | |
592 ~ |
|
593 |
590 |
594 Check that --hidden used with inhibit does not hide every obsolete commit |
591 Check that --hidden used with inhibit does not hide every obsolete commit |
595 We show the log before and after a log -G --hidden, they should be the same |
592 We show the log before and after a log -G --hidden, they should be the same |
596 $ hg log -G |
593 $ hg log -G |
597 o 16:a438c045eb37 add cN |
594 o 16:a438c045eb37 add cN |
819 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase |
816 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase |
820 it. We expect to not see the stack at the end of the rebase. |
817 it. We expect to not see the stack at the end of the rebase. |
821 $ hg log -G -r "25::" |
818 $ hg log -G -r "25::" |
822 @ 25:71eb4f100663 add pk |
819 @ 25:71eb4f100663 add pk |
823 | |
820 | |
824 ~ |
|
825 $ hg up -C 22 |
821 $ hg up -C 22 |
826 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
822 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
827 $ mkcommit Dk |
823 $ mkcommit Dk |
828 $ hg prune 22 -s 25 |
824 $ hg prune 22 -s 25 |
829 1 changesets pruned |
825 1 changesets pruned |
833 $ hg log -G -r "25::" |
829 $ hg log -G -r "25::" |
834 @ 27:1192fa9fbc68 add Dk |
830 @ 27:1192fa9fbc68 add Dk |
835 | |
831 | |
836 o 25:71eb4f100663 add pk |
832 o 25:71eb4f100663 add pk |
837 | |
833 | |
838 ~ |
|
839 |
834 |
840 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). |
835 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). |
841 Rebase the first two revs of the stack onto dest, we expect to see one new |
836 Rebase the first two revs of the stack onto dest, we expect to see one new |
842 revision on the destination and everything visible. |
837 revision on the destination and everything visible. |
843 $ hg up 25 |
838 $ hg up 25 |
855 | |
850 | |
856 | o 27:1192fa9fbc68 add Dk |
851 | o 27:1192fa9fbc68 add Dk |
857 |/ |
852 |/ |
858 o 25:71eb4f100663 add pk |
853 o 25:71eb4f100663 add pk |
859 | |
854 | |
860 ~ |
|
861 $ hg prune 28 -s 27 |
855 $ hg prune 28 -s 27 |
862 1 changesets pruned |
856 1 changesets pruned |
863 $ hg up 25 |
857 $ hg up 25 |
864 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
858 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
865 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
859 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
876 | | |
870 | | |
877 o | 27:1192fa9fbc68 add Dk |
871 o | 27:1192fa9fbc68 add Dk |
878 |/ |
872 |/ |
879 @ 25:71eb4f100663 add pk |
873 @ 25:71eb4f100663 add pk |
880 | |
874 | |
881 ~ |
|
882 |
875 |
883 Rebase the same stack in full on the destination, we expect it to disappear |
876 Rebase the same stack in full on the destination, we expect it to disappear |
884 and only see the top revision added to destination. We don\'t expect 29 to be |
877 and only see the top revision added to destination. We don\'t expect 29 to be |
885 skipped as we used --keep before. |
878 skipped as we used --keep before. |
886 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
879 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
894 | |
887 | |
895 o 27:1192fa9fbc68 add Dk |
888 o 27:1192fa9fbc68 add Dk |
896 | |
889 | |
897 @ 25:71eb4f100663 add pk |
890 @ 25:71eb4f100663 add pk |
898 | |
891 | |
899 ~ |
|
900 |
892 |
901 Pulling from a inhibit repo to a non-inhibit repo should work |
893 Pulling from a inhibit repo to a non-inhibit repo should work |
902 |
894 |
903 $ cd .. |
895 $ cd .. |
904 $ hg clone -q inhibit not-inhibit |
896 $ hg clone -q inhibit not-inhibit |