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