##// END OF EJS Templates
bundle2: add more phase movement in the test...
Pierre-Yves David -
r21649:3bfadd70 default
parent child Browse files
Show More
@@ -764,6 +764,7 b' Real world exchange'
764 clone --pull
764 clone --pull
765
765
766 $ cd ..
766 $ cd ..
767 $ hg -R main phase --public cd010b8cd998
767 $ hg clone main other --pull --rev 9520eea781bc
768 $ hg clone main other --pull --rev 9520eea781bc
768 adding changesets
769 adding changesets
769 adding manifests
770 adding manifests
@@ -774,11 +775,12 b' clone --pull'
774 $ hg -R other log -G
775 $ hg -R other log -G
775 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
776 @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
776 |
777 |
777 o 0:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A
778 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
778
779
779
780
780 pull
781 pull
781
782
783 $ hg -R main phase --public 9520eea781bc
782 $ hg -R other pull -r 24b6387c8c8c
784 $ hg -R other pull -r 24b6387c8c8c
783 pulling from $TESTTMP/main (glob)
785 pulling from $TESTTMP/main (glob)
784 searching for changes
786 searching for changes
@@ -787,15 +789,43 b' pull'
787 adding file changes
789 adding file changes
788 added 1 changesets with 1 changes to 1 files (+1 heads)
790 added 1 changesets with 1 changes to 1 files (+1 heads)
789 (run 'hg heads' to see heads, 'hg merge' to merge)
791 (run 'hg heads' to see heads, 'hg merge' to merge)
792 $ hg -R other log -G
793 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
794 |
795 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
796 |/
797 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
798
790
799
800 pull empty (with phase movement)
801
802 $ hg -R main phase --public 24b6387c8c8c
803 $ hg -R other pull -r 24b6387c8c8c
804 pulling from $TESTTMP/main (glob)
805 no changes found
806 $ hg -R other log -G
807 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
808 |
809 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
810 |/
811 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
812
791 pull empty
813 pull empty
792
814
793 $ hg -R other pull -r 24b6387c8c8c
815 $ hg -R other pull -r 24b6387c8c8c
794 pulling from $TESTTMP/main (glob)
816 pulling from $TESTTMP/main (glob)
795 no changes found
817 no changes found
818 $ hg -R other log -G
819 o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
820 |
821 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
822 |/
823 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
824
796
825
797 push
826 push
798
827
828 $ hg -R main phase --public eea13746799a
799 $ hg -R main push other --rev eea13746799a
829 $ hg -R main push other --rev eea13746799a
800 pushing to other
830 pushing to other
801 searching for changes
831 searching for changes
@@ -803,6 +833,15 b' push'
803 remote: adding manifests
833 remote: adding manifests
804 remote: adding file changes
834 remote: adding file changes
805 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
835 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
836 $ hg -R other log -G
837 o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
838 |\
839 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
840 | |
841 @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
842 |/
843 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
844
806
845
807 pull over ssh
846 pull over ssh
808
847
@@ -839,12 +878,28 b' push over ssh'
839 remote: adding manifests
878 remote: adding manifests
840 remote: adding file changes
879 remote: adding file changes
841 remote: added 1 changesets with 1 changes to 1 files
880 remote: added 1 changesets with 1 changes to 1 files
881 $ hg -R other log -G
882 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C
883 |
884 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B
885 |
886 | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H
887 | |
888 | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
889 | |/|
890 | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
891 |/ /
892 | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
893 |/
894 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
895
842
896
843 push over http
897 push over http
844
898
845 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
899 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
846 $ cat other.pid >> $DAEMON_PIDS
900 $ cat other.pid >> $DAEMON_PIDS
847
901
902 $ hg -R main phase --public 32af7686d403
848 $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403
903 $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403
849 pushing to http://localhost:$HGPORT2/
904 pushing to http://localhost:$HGPORT2/
850 searching for changes
905 searching for changes
@@ -857,21 +912,21 b' push over http'
857 Check final content.
912 Check final content.
858
913
859 $ hg -R other log -G
914 $ hg -R other log -G
860 o 7:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D
915 o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
861 |
916 |
862 o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C
917 o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
863 |
918 |
864 o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B
919 o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
865 |
920 |
866 | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H
921 | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H
867 | |
922 | |
868 | | o 3:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G
923 | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
869 | |/|
924 | |/|
870 | o | 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
925 | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
871 |/ /
926 |/ /
872 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
927 | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
873 |/
928 |/
874 o 0:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A
929 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
875
930
876
931
877 Error Handling
932 Error Handling
General Comments 0
You need to be logged in to leave comments. Login now