Show More
@@ -712,29 +712,36 b' This test issue 3805' | |||||
712 |
|
712 | |||
713 | $ hg init repo-issue3805 |
|
713 | $ hg init repo-issue3805 | |
714 | $ cd repo-issue3805 |
|
714 | $ cd repo-issue3805 | |
|
715 | $ echo "base" > base | |||
|
716 | $ hg ci -Am "base" | |||
|
717 | adding base | |||
715 | $ echo "foo" > foo |
|
718 | $ echo "foo" > foo | |
716 | $ hg ci -Am "A" |
|
719 | $ hg ci -Am "A" | |
717 | adding foo |
|
720 | adding foo | |
718 | $ hg clone . ../other-issue3805 |
|
721 | $ hg clone . ../other-issue3805 | |
719 | updating to branch default |
|
722 | updating to branch default | |
720 |
|
|
723 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
721 | $ echo "bar" >> foo |
|
724 | $ echo "bar" >> foo | |
722 | $ hg ci --amend |
|
725 | $ hg ci --amend | |
723 | $ cd ../other-issue3805 |
|
726 | $ cd ../other-issue3805 | |
724 | $ hg log -G |
|
727 | $ hg log -G | |
725 |
@ |
|
728 | @ 1:29f0c6921ddd (draft) [tip ] A | |
|
729 | | | |||
|
730 | o 0:d20a80d4def3 (draft) [ ] base | |||
726 |
|
731 | |||
727 | $ hg log -G -R ../repo-issue3805 |
|
732 | $ hg log -G -R ../repo-issue3805 | |
728 |
@ |
|
733 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
|
734 | | | |||
|
735 | o 0:d20a80d4def3 (draft) [ ] base | |||
729 |
|
736 | |||
730 | $ hg incoming |
|
737 | $ hg incoming | |
731 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
738 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
732 | searching for changes |
|
739 | searching for changes | |
733 |
|
|
740 | 3:323a9c3ddd91 (draft) [tip ] A | |
734 | $ hg incoming --bundle ../issue3805.hg |
|
741 | $ hg incoming --bundle ../issue3805.hg | |
735 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
742 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
736 | searching for changes |
|
743 | searching for changes | |
737 |
|
|
744 | 3:323a9c3ddd91 (draft) [tip ] A | |
738 | $ hg outgoing |
|
745 | $ hg outgoing | |
739 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
746 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
740 | searching for changes |
|
747 | searching for changes | |
@@ -749,7 +756,7 b' This test issue 3805' | |||||
749 | $ hg incoming http://localhost:$HGPORT |
|
756 | $ hg incoming http://localhost:$HGPORT | |
750 | comparing with http://localhost:$HGPORT/ |
|
757 | comparing with http://localhost:$HGPORT/ | |
751 | searching for changes |
|
758 | searching for changes | |
752 |
|
|
759 | 2:323a9c3ddd91 (draft) [tip ] A | |
753 | $ hg outgoing http://localhost:$HGPORT |
|
760 | $ hg outgoing http://localhost:$HGPORT | |
754 | comparing with http://localhost:$HGPORT/ |
|
761 | comparing with http://localhost:$HGPORT/ | |
755 | searching for changes |
|
762 | searching for changes | |
@@ -767,13 +774,13 b' This test issue 3814' | |||||
767 | $ cd .. |
|
774 | $ cd .. | |
768 | $ hg init repo-issue3814 |
|
775 | $ hg init repo-issue3814 | |
769 | $ cd repo-issue3805 |
|
776 | $ cd repo-issue3805 | |
770 |
$ hg push -r 3 |
|
777 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 | |
771 | pushing to ../repo-issue3814 |
|
778 | pushing to ../repo-issue3814 | |
772 | searching for changes |
|
779 | searching for changes | |
773 | adding changesets |
|
780 | adding changesets | |
774 | adding manifests |
|
781 | adding manifests | |
775 | adding file changes |
|
782 | adding file changes | |
776 |
added |
|
783 | added 2 changesets with 2 changes to 2 files | |
777 | 2 new obsolescence markers |
|
784 | 2 new obsolescence markers | |
778 | $ hg out ../repo-issue3814 |
|
785 | $ hg out ../repo-issue3814 | |
779 | comparing with ../repo-issue3814 |
|
786 | comparing with ../repo-issue3814 | |
@@ -783,24 +790,26 b' This test issue 3814' | |||||
783 |
|
790 | |||
784 | Test that a local tag blocks a changeset from being hidden |
|
791 | Test that a local tag blocks a changeset from being hidden | |
785 |
|
792 | |||
786 |
$ hg tag -l visible -r |
|
793 | $ hg tag -l visible -r 1 --hidden | |
787 | $ hg log -G |
|
794 | $ hg log -G | |
788 |
@ |
|
795 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
789 |
|
796 | | | ||
790 |
|
|
797 | | x 1:29f0c6921ddd (draft) [visible ] A | |
|
798 | |/ | |||
|
799 | o 0:d20a80d4def3 (draft) [ ] base | |||
791 |
|
800 | |||
792 | Test that removing a local tag does not cause some commands to fail |
|
801 | Test that removing a local tag does not cause some commands to fail | |
793 |
|
802 | |||
794 | $ hg tag -l -r tip tiptag |
|
803 | $ hg tag -l -r tip tiptag | |
795 | $ hg tags |
|
804 | $ hg tags | |
796 |
tiptag |
|
805 | tiptag 3:323a9c3ddd91 | |
797 |
tip |
|
806 | tip 3:323a9c3ddd91 | |
798 |
visible |
|
807 | visible 1:29f0c6921ddd | |
799 | $ hg --config extensions.strip= strip -r tip --no-backup |
|
808 | $ hg --config extensions.strip= strip -r tip --no-backup | |
800 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
809 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
801 | $ hg tags |
|
810 | $ hg tags | |
802 |
visible |
|
811 | visible 1:29f0c6921ddd | |
803 |
tip |
|
812 | tip 1:29f0c6921ddd | |
804 |
|
813 | |||
805 | Test bundle overlay onto hidden revision |
|
814 | Test bundle overlay onto hidden revision | |
806 |
|
815 |
General Comments 0
You need to be logged in to leave comments.
Login now