Show More
@@ -758,3 +758,140 b' Check the result of the push' | |||
|
758 | 758 | |/ |
|
759 | 759 | @ 842e2fac6304 C-ROOT (default) |
|
760 | 760 | |
|
761 | ||
|
762 | pushing raced push touch multiple heads | |
|
763 | --------------------------------------- | |
|
764 | ||
|
765 | There are multiple heads, the raced push touch all of them | |
|
766 | ||
|
767 | # b | |
|
768 | # | a (raced) | |
|
769 | # |/| | |
|
770 | # * * | |
|
771 | # |/ | |
|
772 | # * | |
|
773 | ||
|
774 | (resync-all) | |
|
775 | ||
|
776 | $ hg -R ./server pull ./client-racy | |
|
777 | pulling from ./client-racy | |
|
778 | searching for changes | |
|
779 | adding changesets | |
|
780 | adding manifests | |
|
781 | adding file changes | |
|
782 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
783 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
|
784 | $ hg -R ./client-other pull | |
|
785 | pulling from ssh://user@dummy/server | |
|
786 | searching for changes | |
|
787 | adding changesets | |
|
788 | adding manifests | |
|
789 | adding file changes | |
|
790 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
791 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
|
792 | $ hg -R ./client-racy pull | |
|
793 | pulling from ssh://user@dummy/server | |
|
794 | searching for changes | |
|
795 | adding changesets | |
|
796 | adding manifests | |
|
797 | adding file changes | |
|
798 | added 1 changesets with 0 changes to 0 files | |
|
799 | (run 'hg update' to get a working copy) | |
|
800 | ||
|
801 | $ hg -R server graph | |
|
802 | o cac2cead0ff0 C-L (default) | |
|
803 | | | |
|
804 | | o be705100c623 C-K (default) | |
|
805 | |/| | |
|
806 | | o d603e2c0cdd7 C-E (default) | |
|
807 | | | | |
|
808 | o | 59e76faf78bd C-D (default) | |
|
809 | | | | |
|
810 | | | o 89420bf00fae C-J (default) | |
|
811 | | | | | |
|
812 | | | | o b35ed749f288 C-I (my-second-test-branch) | |
|
813 | | | |/ | |
|
814 | | | o 75d69cba5402 C-G (default) | |
|
815 | | | | | |
|
816 | | | | o 833be552cfe6 C-H (my-first-test-branch) | |
|
817 | | | |/ | |
|
818 | | | o d9e379a8c432 C-F (default) | |
|
819 | | | | | |
|
820 | | | o 51c544a58128 C-C (default) | |
|
821 | | |/ | |
|
822 | o | a9149a1428e2 C-B (default) | |
|
823 | | | | |
|
824 | | o 98217d5a1659 C-A (default) | |
|
825 | |/ | |
|
826 | @ 842e2fac6304 C-ROOT (default) | |
|
827 | ||
|
828 | ||
|
829 | Creating changesets | |
|
830 | ||
|
831 | (update existing head) | |
|
832 | ||
|
833 | $ echo aaa >> client-other/a | |
|
834 | $ hg -R client-other/ commit -m "C-M" | |
|
835 | ||
|
836 | (merge heads) | |
|
837 | ||
|
838 | $ hg -R client-racy/ merge 'desc("C-K")' | |
|
839 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
840 | (branch merge, don't forget to commit) | |
|
841 | $ hg -R client-racy/ commit -m "C-N" | |
|
842 | ||
|
843 | Pushing | |
|
844 | ||
|
845 | $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & | |
|
846 | ||
|
847 | $ waiton $TESTTMP/readyfile | |
|
848 | ||
|
849 | $ hg -R client-other push -fr 'tip' --new-branch | |
|
850 | pushing to ssh://user@dummy/server | |
|
851 | searching for changes | |
|
852 | remote: adding changesets | |
|
853 | remote: adding manifests | |
|
854 | remote: adding file changes | |
|
855 | remote: added 1 changesets with 1 changes to 1 files | |
|
856 | ||
|
857 | $ release $TESTTMP/watchfile | |
|
858 | ||
|
859 | Check the result of the push | |
|
860 | ||
|
861 | $ cat ./push-log | |
|
862 | pushing to ssh://user@dummy/server | |
|
863 | searching for changes | |
|
864 | wrote ready: $TESTTMP/readyfile | |
|
865 | waiting on: $TESTTMP/watchfile | |
|
866 | abort: push failed: | |
|
867 | 'repository changed while pushing - please try again' | |
|
868 | ||
|
869 | $ hg -R server graph | |
|
870 | o 6fd3090135df C-M (default) | |
|
871 | | | |
|
872 | o be705100c623 C-K (default) | |
|
873 | |\ | |
|
874 | | o d603e2c0cdd7 C-E (default) | |
|
875 | | | | |
|
876 | +---o cac2cead0ff0 C-L (default) | |
|
877 | | | | |
|
878 | o | 59e76faf78bd C-D (default) | |
|
879 | | | | |
|
880 | | | o 89420bf00fae C-J (default) | |
|
881 | | | | | |
|
882 | | | | o b35ed749f288 C-I (my-second-test-branch) | |
|
883 | | | |/ | |
|
884 | | | o 75d69cba5402 C-G (default) | |
|
885 | | | | | |
|
886 | | | | o 833be552cfe6 C-H (my-first-test-branch) | |
|
887 | | | |/ | |
|
888 | | | o d9e379a8c432 C-F (default) | |
|
889 | | | | | |
|
890 | | | o 51c544a58128 C-C (default) | |
|
891 | | |/ | |
|
892 | o | a9149a1428e2 C-B (default) | |
|
893 | | | | |
|
894 | | o 98217d5a1659 C-A (default) | |
|
895 | |/ | |
|
896 | @ 842e2fac6304 C-ROOT (default) | |
|
897 |
General Comments 0
You need to be logged in to leave comments.
Login now