equal
deleted
inserted
replaced
740 $ hg strip -r 0 |
740 $ hg strip -r 0 |
741 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
741 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
742 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg |
742 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg |
743 $ ls .hg/strip-backup |
743 $ ls .hg/strip-backup |
744 3903775176ed-e68910bd-backup.hg |
744 3903775176ed-e68910bd-backup.hg |
|
745 #if repobundlerepo |
745 $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg |
746 $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg |
746 $ hg strip -r 0 |
747 $ hg strip -r 0 |
747 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg |
748 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg |
748 $ ls .hg/strip-backup |
749 $ ls .hg/strip-backup |
749 3903775176ed-54390173-backup.hg |
750 3903775176ed-54390173-backup.hg |
750 3903775176ed-e68910bd-backup.hg |
751 3903775176ed-e68910bd-backup.hg |
|
752 #endif |
751 $ cd .. |
753 $ cd .. |
752 |
754 |
753 Test that we only bundle the stripped changesets (issue4736) |
755 Test that we only bundle the stripped changesets (issue4736) |
754 ------------------------------------------------------------ |
756 ------------------------------------------------------------ |
755 |
757 |
811 |
813 |
812 Check bundle behavior: |
814 Check bundle behavior: |
813 |
815 |
814 $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg |
816 $ hg bundle -r 'desc(mergeCD)' --base 'desc(commitC)' ../issue4736.hg |
815 2 changesets found |
817 2 changesets found |
|
818 #if repobundlerepo |
816 $ hg log -r 'bundle()' -R ../issue4736.hg |
819 $ hg log -r 'bundle()' -R ../issue4736.hg |
817 changeset: 3:6625a5168474 |
820 changeset: 3:6625a5168474 |
818 parent: 1:eca11cf91c71 |
821 parent: 1:eca11cf91c71 |
819 user: test |
822 user: test |
820 date: Thu Jan 01 00:00:00 1970 +0000 |
823 date: Thu Jan 01 00:00:00 1970 +0000 |
826 parent: 3:6625a5168474 |
829 parent: 3:6625a5168474 |
827 user: test |
830 user: test |
828 date: Thu Jan 01 00:00:00 1970 +0000 |
831 date: Thu Jan 01 00:00:00 1970 +0000 |
829 summary: mergeCD |
832 summary: mergeCD |
830 |
833 |
|
834 #endif |
831 |
835 |
832 check strip behavior |
836 check strip behavior |
833 |
837 |
834 $ hg --config extensions.strip= strip 'desc(commitD)' --debug |
838 $ hg --config extensions.strip= strip 'desc(commitD)' --debug |
835 resolving manifests |
839 resolving manifests |
870 summary: commitA |
874 summary: commitA |
871 |
875 |
872 |
876 |
873 strip backup content |
877 strip backup content |
874 |
878 |
|
879 #if repobundlerepo |
875 $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg |
880 $ hg log -r 'bundle()' -R .hg/strip-backup/6625a5168474-*-backup.hg |
876 changeset: 3:6625a5168474 |
881 changeset: 3:6625a5168474 |
877 parent: 1:eca11cf91c71 |
882 parent: 1:eca11cf91c71 |
878 user: test |
883 user: test |
879 date: Thu Jan 01 00:00:00 1970 +0000 |
884 date: Thu Jan 01 00:00:00 1970 +0000 |
885 parent: 3:6625a5168474 |
890 parent: 3:6625a5168474 |
886 user: test |
891 user: test |
887 date: Thu Jan 01 00:00:00 1970 +0000 |
892 date: Thu Jan 01 00:00:00 1970 +0000 |
888 summary: mergeCD |
893 summary: mergeCD |
889 |
894 |
|
895 |
|
896 #endif |
|
897 |
890 Check that the phase cache is properly invalidated after a strip with bookmark. |
898 Check that the phase cache is properly invalidated after a strip with bookmark. |
891 |
899 |
892 $ cat > ../stripstalephasecache.py << EOF |
900 $ cat > ../stripstalephasecache.py << EOF |
893 > from mercurial import extensions, localrepo |
901 > from mercurial import extensions, localrepo |
894 > def transactioncallback(orig, repo, desc, *args, **kwargs): |
902 > def transactioncallback(orig, repo, desc, *args, **kwargs): |