622 a66b68853635 |
622 a66b68853635 |
623 013b27f11536 |
623 013b27f11536 |
624 4bbfc6078919 |
624 4bbfc6078919 |
625 $ cd .. |
625 $ cd .. |
626 |
626 |
627 Check criss cross merge |
|
628 ======================= |
|
629 |
|
630 $ hg init crisscross_A |
|
631 $ cd crisscross_A |
|
632 $ hg debugbuilddag ' |
|
633 > ...:base # create some base |
|
634 > # criss cross #1: simple |
|
635 > +3:AbaseA # "A" branch for CC "A" |
|
636 > <base+2:AbaseB # "B" branch for CC "B" |
|
637 > <AbaseA/AbaseB:AmergeA |
|
638 > <AbaseB/AbaseA:AmergeB |
|
639 > <AmergeA/AmergeB:Afinal |
|
640 > # criss cross #2:multiple closes ones |
|
641 > .:BbaseA |
|
642 > <AmergeB:BbaseB |
|
643 > <BbaseA/BbaseB:BmergeA |
|
644 > <BbaseB/BbaseA:BmergeB |
|
645 > <BmergeA/BmergeB:BmergeC |
|
646 > <BmergeB/BmergeA:BmergeD |
|
647 > <BmergeC/BmergeD:Bfinal |
|
648 > # criss cross #2:many branches |
|
649 > <Bfinal.:CbaseA |
|
650 > <Bfinal+2:CbaseB |
|
651 > <Bfinal.:CbaseC |
|
652 > <Bfinal+5:CbaseD |
|
653 > <Bfinal.:CbaseE |
|
654 > <CbaseA/CbaseB+7:CmergeA |
|
655 > <CbaseA/CbaseC:CmergeB |
|
656 > <CbaseA/CbaseD.:CmergeC |
|
657 > <CbaseA/CbaseE:CmergeD |
|
658 > <CbaseB/CbaseA+2:CmergeE |
|
659 > <CbaseB/CbaseC:CmergeF |
|
660 > <CbaseB/CbaseD.:CmergeG |
|
661 > <CbaseB/CbaseE:CmergeH |
|
662 > <CbaseC/CbaseA.:CmergeI |
|
663 > <CbaseC/CbaseB:CmergeJ |
|
664 > <CbaseC/CbaseD+5:CmergeK |
|
665 > <CbaseC/CbaseE+2:CmergeL |
|
666 > <CbaseD/CbaseA:CmergeM |
|
667 > <CbaseD/CbaseB...:CmergeN |
|
668 > <CbaseD/CbaseC:CmergeO |
|
669 > <CbaseD/CbaseE:CmergeP |
|
670 > <CbaseE/CbaseA:CmergeQ |
|
671 > <CbaseE/CbaseB..:CmergeR |
|
672 > <CbaseE/CbaseC.:CmergeS |
|
673 > <CbaseE/CbaseD:CmergeT |
|
674 > <CmergeA/CmergeG:CmergeWA |
|
675 > <CmergeB/CmergeF:CmergeWB |
|
676 > <CmergeC/CmergeE:CmergeWC |
|
677 > <CmergeD/CmergeH:CmergeWD |
|
678 > <CmergeT/CmergeI:CmergeWE |
|
679 > <CmergeS/CmergeJ:CmergeWF |
|
680 > <CmergeR/CmergeK:CmergeWG |
|
681 > <CmergeQ/CmergeL:CmergeWH |
|
682 > <CmergeP/CmergeM:CmergeWI |
|
683 > <CmergeO/CmergeN:CmergeWJ |
|
684 > <CmergeO/CmergeN:CmergeWK |
|
685 > <CmergeWA/CmergeWG:CmergeXA |
|
686 > <CmergeWB/CmergeWH:CmergeXB |
|
687 > <CmergeWC/CmergeWI:CmergeXC |
|
688 > <CmergeWD/CmergeWJ:CmergeXD |
|
689 > <CmergeWE/CmergeWK:CmergeXE |
|
690 > <CmergeWF/CmergeWA:CmergeXF |
|
691 > <CmergeXA/CmergeXF:CmergeYA |
|
692 > <CmergeXB/CmergeXE:CmergeYB |
|
693 > <CmergeXC/CmergeXD:CmergeYC |
|
694 > <CmergeYA/CmergeYB:CmergeZA |
|
695 > <CmergeYC/CmergeYB:CmergeZB |
|
696 > <CmergeZA/CmergeZB:Cfinal |
|
697 > ' |
|
698 $ hg log -G |
|
699 o 94 01f771406cab r94 Cfinal tip |
|
700 |\ |
|
701 | o 93 84d6ec6a8e21 r93 CmergeZB |
|
702 | |\ |
|
703 o | | 92 721ba7c5f4ff r92 CmergeZA |
|
704 |\| | |
|
705 | | o 91 8ae32c3ed670 r91 CmergeYC |
|
706 | | |\ |
|
707 | o \ \ 90 8b79544bb56d r90 CmergeYB |
|
708 | |\ \ \ |
|
709 o \ \ \ \ 89 041e1188f5f1 r89 CmergeYA |
|
710 |\ \ \ \ \ |
|
711 | o \ \ \ \ 88 2472d042ec95 r88 CmergeXF |
|
712 | |\ \ \ \ \ |
|
713 | | | | o \ \ 87 c7d3029bf731 r87 CmergeXE |
|
714 | | | | |\ \ \ |
|
715 | | | | | | | o 86 469c700e9ed8 r86 CmergeXD |
|
716 | | | | | | | |\ |
|
717 | | | | | | o \ \ 85 28be96b80dc1 r85 CmergeXC |
|
718 | | | | | | |\ \ \ |
|
719 | | | o \ \ \ \ \ \ 84 dbde319d43a3 r84 CmergeXB |
|
720 | | | |\ \ \ \ \ \ \ |
|
721 o | | | | | | | | | | 83 b3cf98c3d587 r83 CmergeXA |
|
722 |\| | | | | | | | | | |
|
723 | | | | | | o | | | | 82 1da228afcf06 r82 CmergeWK |
|
724 | | | | | | |\ \ \ \ \ |
|
725 | | | | | | +-+-------o 81 0bab31f71a21 r81 CmergeWJ |
|
726 | | | | | | | | | | | |
|
727 | | | | | | | | | o | 80 cd345198cf12 r80 CmergeWI |
|
728 | | | | | | | | | |\ \ |
|
729 | | | | o \ \ \ \ \ \ \ 79 82238c0bc950 r79 CmergeWH |
|
730 | | | | |\ \ \ \ \ \ \ \ |
|
731 o \ \ \ \ \ \ \ \ \ \ \ \ 78 89a0fe204177 r78 CmergeWG |
|
732 |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
733 | | | o \ \ \ \ \ \ \ \ \ \ 77 97d19fc5236f r77 CmergeWF |
|
734 | | | |\ \ \ \ \ \ \ \ \ \ \ |
|
735 | | | | | | | | o \ \ \ \ \ \ 76 37ad3ab0cddf r76 CmergeWE |
|
736 | | | | | | | | |\ \ \ \ \ \ \ |
|
737 | | | | | | | | | | | | | | | o 75 790cdfecd168 r75 CmergeWD |
|
738 | | | | | | | | | | | | | | | |\ |
|
739 | | | | | | | | | | | | o \ \ \ \ 74 698970a2480b r74 CmergeWC |
|
740 | | | | | | | | | | | | |\ \ \ \ \ |
|
741 | | | | | o \ \ \ \ \ \ \ \ \ \ \ \ 73 31d7b43cc321 r73 CmergeWB |
|
742 | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
743 | | o \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 72 eed373b0090d r72 CmergeWA |
|
744 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
745 | | | | | | | | | | | o \ \ \ \ \ \ \ \ 71 4f3b41956174 r71 CmergeT |
|
746 | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ |
|
747 | | | | | o | | | | | | | | | | | | | | | 70 c3c7fa726f88 r70 CmergeS |
|
748 | | | | | | | | | | | | | | | | | | | | | |
|
749 | | | | | o-------------+ | | | | | | | | 69 d917f77a6439 r69 |
|
750 | | | | | | | | | | | | | | | | | | | | | |
|
751 | o | | | | | | | | | | | | | | | | | | | 68 fac9e582edd1 r68 CmergeR |
|
752 | | | | | | | | | | | | | | | | | | | | | |
|
753 | o | | | | | | | | | | | | | | | | | | | 67 e4cfd6264623 r67 |
|
754 | | | | | | | | | | | | | | | | | | | | | |
|
755 | o---------------------+ | | | | | | | | 66 d99e0f7dad5b r66 |
|
756 | | | | | | | | | | | | | | | | | | | | | |
|
757 | | | | | | | | | o-----+ | | | | | | | | 65 c713eae2d31f r65 CmergeQ |
|
758 | | | | | | | | | | | | | | | | | | | | | |
|
759 | | | | | | | | | | | +-+-----------o | | 64 b33fd5ad4c0c r64 CmergeP |
|
760 | | | | | | | | | | | | | | | | | | / / |
|
761 | | | | | +-----------+-----o | | | / / 63 bf6593f7e073 r63 CmergeO |
|
762 | | | | | | | | | | | | | | / / / / / |
|
763 | | | | | | | | | | | | | o | | | | | 62 3871506da61e r62 CmergeN |
|
764 | | | | | | | | | | | | | | | | | | | |
|
765 | | | | | | | | | | | | | o | | | | | 61 c84da74cf586 r61 |
|
766 | | | | | | | | | | | | | | | | | | | |
|
767 | | | | | | | | | | | | | o | | | | | 60 5eec91b12a58 r60 |
|
768 | | | | | | | | | | | | | | | | | | | |
|
769 | +-------------------+---o | | | | | 59 0484d39906c8 r59 |
|
770 | | | | | | | | | | | | | / / / / / |
|
771 | | | | | | | | | +---+-------o / / 58 29141354a762 r58 CmergeM |
|
772 | | | | | | | | | | | | | | | / / |
|
773 | | | | | | | | o | | | | | | | | 57 e7135b665740 r57 CmergeL |
|
774 | | | | | | | | | | | | | | | | | |
|
775 | | | | | | | | o | | | | | | | | 56 c7c1497fc270 r56 |
|
776 | | | | | | | | | | | | | | | | | |
|
777 | | | | | +-----o-------+ | | | | 55 76151e8066e1 r55 |
|
778 | | | | | | | | / / / / / / / / |
|
779 o | | | | | | | | | | | | | | | 54 9a67238ad1c4 r54 CmergeK |
|
780 | | | | | | | | | | | | | | | | |
|
781 o | | | | | | | | | | | | | | | 53 c37e7cd9f2bd r53 |
|
782 | | | | | | | | | | | | | | | | |
|
783 o | | | | | | | | | | | | | | | 52 0d153e3ad632 r52 |
|
784 | | | | | | | | | | | | | | | | |
|
785 o | | | | | | | | | | | | | | | 51 97ac964e34b7 r51 |
|
786 | | | | | | | | | | | | | | | | |
|
787 o | | | | | | | | | | | | | | | 50 900dd066a072 r50 |
|
788 | | | | | | | | | | | | | | | | |
|
789 o---------+---------+ | | | | | 49 673f5499c8c2 r49 |
|
790 / / / / / / / / / / / / / / / |
|
791 +-----o / / / / / / / / / / / 48 8ecb28746ec4 r48 CmergeJ |
|
792 | | | |/ / / / / / / / / / / |
|
793 | | | | | | | o | | | | | | 47 d6c9e2d27f14 r47 CmergeI |
|
794 | | | | | | | | | | | | | | |
|
795 | | | +-------o | | | | | | 46 bfcfd9a61e84 r46 |
|
796 | | | | | | |/ / / / / / / |
|
797 +---------------+-------o 45 40553f55397e r45 CmergeH |
|
798 | | | | | | | | | | | | |
|
799 | | o | | | | | | | | | 44 d94da36be176 r44 CmergeG |
|
800 | | | | | | | | | | | | |
|
801 +---o---------+ | | | | 43 4b39f229a0ce r43 |
|
802 | | / / / / / / / / / |
|
803 +---+---o / / / / / / 42 43fc0b77ff07 r42 CmergeF |
|
804 | | | | / / / / / / |
|
805 | | | | | | | | o | 41 88eace5ce682 r41 CmergeE |
|
806 | | | | | | | | | | |
|
807 | | | | | | | | o | 40 d928b4e8a515 r40 |
|
808 | | | | | | | | | | |
|
809 +-------+-------o | 39 88714f4125cb r39 |
|
810 | | | | | | | | / |
|
811 | | | | +---+---o 38 e3e6738c56ce r38 CmergeD |
|
812 | | | | | | | | |
|
813 | | | | | | | o 37 32b41ca704e1 r37 CmergeC |
|
814 | | | | | | | | |
|
815 | | | | +-+---o 36 01e29e20ea3f r36 |
|
816 | | | | | | | |
|
817 | | | o | | | 35 1f4a19f83a29 r35 CmergeB |
|
818 | | |/|/ / / |
|
819 | o | | | | 34 722d1b8b8942 r34 CmergeA |
|
820 | | | | | | |
|
821 | o | | | | 33 47c836a1f13e r33 |
|
822 | | | | | | |
|
823 | o | | | | 32 2ea3fbf151b5 r32 |
|
824 | | | | | | |
|
825 | o | | | | 31 0c3f2ba59eb7 r31 |
|
826 | | | | | | |
|
827 | o | | | | 30 f3441cd3e664 r30 |
|
828 | | | | | | |
|
829 | o | | | | 29 b9c3aa92fba5 r29 |
|
830 | | | | | | |
|
831 | o | | | | 28 3bdb00d5c818 r28 |
|
832 | | | | | | |
|
833 | o---+ | | 27 2bd677d0f13a r27 |
|
834 |/ / / / / |
|
835 | | | | o 26 de05b9c29ec7 r26 CbaseE |
|
836 | | | | | |
|
837 | | | o | 25 ad46a4a0fc10 r25 CbaseD |
|
838 | | | | | |
|
839 | | | o | 24 a457569c5306 r24 |
|
840 | | | | | |
|
841 | | | o | 23 f2bdd828a3aa r23 |
|
842 | | | | | |
|
843 | | | o | 22 5ce588c2b7c5 r22 |
|
844 | | | | | |
|
845 | | | o | 21 17b6e6bac221 r21 |
|
846 | | | |/ |
|
847 | o---+ 20 b115c694654e r20 CbaseC |
|
848 | / / |
|
849 o | | 19 884936b34999 r19 CbaseB |
|
850 | | | |
|
851 o---+ 18 9729470d9329 r18 |
|
852 / / |
|
853 o / 17 4f5078f7da8a r17 CbaseA |
|
854 |/ |
|
855 o 16 3e1560705803 r16 Bfinal |
|
856 |\ |
|
857 | o 15 55bf3fdb634f r15 BmergeD |
|
858 | |\ |
|
859 o---+ 14 39bab1cb1cbe r14 BmergeC |
|
860 |/ / |
|
861 | o 13 f7c6e7bfbcd0 r13 BmergeB |
|
862 | |\ |
|
863 o---+ 12 26f59ee8b1d7 r12 BmergeA |
|
864 |/ / |
|
865 | o 11 3e2da24aee59 r11 BbaseA |
|
866 | | |
|
867 | o 10 5ba9a53052ed r10 Afinal |
|
868 |/| |
|
869 o | 9 07c648efceeb r9 AmergeB BbaseB |
|
870 |\ \ |
|
871 +---o 8 c81423bf5a24 r8 AmergeA |
|
872 | |/ |
|
873 | o 7 65eb34ffc3a8 r7 AbaseB |
|
874 | | |
|
875 | o 6 0c1445abb33d r6 |
|
876 | | |
|
877 o | 5 c8d03c1b5e94 r5 AbaseA |
|
878 | | |
|
879 o | 4 bebd167eb94d r4 |
|
880 | | |
|
881 o | 3 2dc09a01254d r3 |
|
882 |/ |
|
883 o 2 01241442b3c2 r2 base |
|
884 | |
|
885 o 1 66f7d451a68b r1 |
|
886 | |
|
887 o 0 1ea73414a91b r0 |
|
888 |
|
889 |
|
890 Basic check |
|
891 ----------- |
|
892 |
|
893 $ hg showsort --rev 'Afinal' |
|
894 1ea73414a91b |
|
895 66f7d451a68b |
|
896 01241442b3c2 |
|
897 0c1445abb33d |
|
898 65eb34ffc3a8 |
|
899 2dc09a01254d |
|
900 bebd167eb94d |
|
901 c8d03c1b5e94 |
|
902 07c648efceeb |
|
903 c81423bf5a24 |
|
904 5ba9a53052ed |
|
905 $ checktopo Afinal |
|
906 === checking 1ea73414a91b === |
|
907 === checking 66f7d451a68b === |
|
908 === checking 01241442b3c2 === |
|
909 === checking 0c1445abb33d === |
|
910 === checking 65eb34ffc3a8 === |
|
911 === checking 2dc09a01254d === |
|
912 === checking bebd167eb94d === |
|
913 === checking c8d03c1b5e94 === |
|
914 === checking 07c648efceeb === |
|
915 === checking c81423bf5a24 === |
|
916 === checking 5ba9a53052ed === |
|
917 $ hg showsort --rev 'AmergeA' |
|
918 1ea73414a91b |
|
919 66f7d451a68b |
|
920 01241442b3c2 |
|
921 0c1445abb33d |
|
922 65eb34ffc3a8 |
|
923 2dc09a01254d |
|
924 bebd167eb94d |
|
925 c8d03c1b5e94 |
|
926 c81423bf5a24 |
|
927 $ checktopo AmergeA |
|
928 === checking 1ea73414a91b === |
|
929 === checking 66f7d451a68b === |
|
930 === checking 01241442b3c2 === |
|
931 === checking 0c1445abb33d === |
|
932 === checking 65eb34ffc3a8 === |
|
933 === checking 2dc09a01254d === |
|
934 === checking bebd167eb94d === |
|
935 === checking c8d03c1b5e94 === |
|
936 === checking c81423bf5a24 === |
|
937 $ hg showsort --rev 'AmergeB' |
|
938 1ea73414a91b |
|
939 66f7d451a68b |
|
940 01241442b3c2 |
|
941 0c1445abb33d |
|
942 65eb34ffc3a8 |
|
943 2dc09a01254d |
|
944 bebd167eb94d |
|
945 c8d03c1b5e94 |
|
946 07c648efceeb |
|
947 $ checktopo AmergeB |
|
948 === checking 1ea73414a91b === |
|
949 === checking 66f7d451a68b === |
|
950 === checking 01241442b3c2 === |
|
951 === checking 0c1445abb33d === |
|
952 === checking 65eb34ffc3a8 === |
|
953 === checking 2dc09a01254d === |
|
954 === checking bebd167eb94d === |
|
955 === checking c8d03c1b5e94 === |
|
956 === checking 07c648efceeb === |
|
957 |
|
958 close criss cross |
|
959 $ hg showsort --rev 'Bfinal' |
|
960 1ea73414a91b |
|
961 66f7d451a68b |
|
962 01241442b3c2 |
|
963 0c1445abb33d |
|
964 65eb34ffc3a8 |
|
965 2dc09a01254d |
|
966 bebd167eb94d |
|
967 c8d03c1b5e94 |
|
968 07c648efceeb |
|
969 c81423bf5a24 |
|
970 5ba9a53052ed |
|
971 3e2da24aee59 |
|
972 26f59ee8b1d7 |
|
973 f7c6e7bfbcd0 |
|
974 39bab1cb1cbe |
|
975 55bf3fdb634f |
|
976 3e1560705803 |
|
977 $ checktopo Bfinal |
|
978 === checking 1ea73414a91b === |
|
979 === checking 66f7d451a68b === |
|
980 === checking 01241442b3c2 === |
|
981 === checking 0c1445abb33d === |
|
982 === checking 65eb34ffc3a8 === |
|
983 === checking 2dc09a01254d === |
|
984 === checking bebd167eb94d === |
|
985 === checking c8d03c1b5e94 === |
|
986 === checking 07c648efceeb === |
|
987 === checking c81423bf5a24 === |
|
988 === checking 5ba9a53052ed === |
|
989 === checking 3e2da24aee59 === |
|
990 === checking 26f59ee8b1d7 === |
|
991 === checking f7c6e7bfbcd0 === |
|
992 === checking 39bab1cb1cbe === |
|
993 === checking 55bf3fdb634f === |
|
994 === checking 3e1560705803 === |
|
995 |
|
996 many branches criss cross |
|
997 |
|
998 $ hg showsort --rev 'Cfinal' |
|
999 1ea73414a91b |
|
1000 66f7d451a68b |
|
1001 01241442b3c2 |
|
1002 0c1445abb33d |
|
1003 65eb34ffc3a8 |
|
1004 2dc09a01254d |
|
1005 bebd167eb94d |
|
1006 c8d03c1b5e94 |
|
1007 07c648efceeb |
|
1008 c81423bf5a24 |
|
1009 5ba9a53052ed |
|
1010 3e2da24aee59 |
|
1011 26f59ee8b1d7 |
|
1012 f7c6e7bfbcd0 |
|
1013 39bab1cb1cbe |
|
1014 55bf3fdb634f |
|
1015 3e1560705803 |
|
1016 17b6e6bac221 |
|
1017 5ce588c2b7c5 |
|
1018 f2bdd828a3aa |
|
1019 a457569c5306 |
|
1020 ad46a4a0fc10 |
|
1021 4f5078f7da8a |
|
1022 01e29e20ea3f |
|
1023 32b41ca704e1 |
|
1024 29141354a762 |
|
1025 9729470d9329 |
|
1026 884936b34999 |
|
1027 0484d39906c8 |
|
1028 5eec91b12a58 |
|
1029 c84da74cf586 |
|
1030 3871506da61e |
|
1031 2bd677d0f13a |
|
1032 3bdb00d5c818 |
|
1033 b9c3aa92fba5 |
|
1034 f3441cd3e664 |
|
1035 0c3f2ba59eb7 |
|
1036 2ea3fbf151b5 |
|
1037 47c836a1f13e |
|
1038 722d1b8b8942 |
|
1039 4b39f229a0ce |
|
1040 d94da36be176 |
|
1041 eed373b0090d |
|
1042 88714f4125cb |
|
1043 d928b4e8a515 |
|
1044 88eace5ce682 |
|
1045 698970a2480b |
|
1046 b115c694654e |
|
1047 1f4a19f83a29 |
|
1048 43fc0b77ff07 |
|
1049 31d7b43cc321 |
|
1050 673f5499c8c2 |
|
1051 900dd066a072 |
|
1052 97ac964e34b7 |
|
1053 0d153e3ad632 |
|
1054 c37e7cd9f2bd |
|
1055 9a67238ad1c4 |
|
1056 8ecb28746ec4 |
|
1057 bf6593f7e073 |
|
1058 0bab31f71a21 |
|
1059 1da228afcf06 |
|
1060 bfcfd9a61e84 |
|
1061 d6c9e2d27f14 |
|
1062 de05b9c29ec7 |
|
1063 40553f55397e |
|
1064 4f3b41956174 |
|
1065 37ad3ab0cddf |
|
1066 c7d3029bf731 |
|
1067 76151e8066e1 |
|
1068 c7c1497fc270 |
|
1069 e7135b665740 |
|
1070 b33fd5ad4c0c |
|
1071 cd345198cf12 |
|
1072 28be96b80dc1 |
|
1073 c713eae2d31f |
|
1074 82238c0bc950 |
|
1075 dbde319d43a3 |
|
1076 8b79544bb56d |
|
1077 d917f77a6439 |
|
1078 c3c7fa726f88 |
|
1079 97d19fc5236f |
|
1080 2472d042ec95 |
|
1081 d99e0f7dad5b |
|
1082 e4cfd6264623 |
|
1083 fac9e582edd1 |
|
1084 89a0fe204177 |
|
1085 b3cf98c3d587 |
|
1086 041e1188f5f1 |
|
1087 721ba7c5f4ff |
|
1088 e3e6738c56ce |
|
1089 790cdfecd168 |
|
1090 469c700e9ed8 |
|
1091 8ae32c3ed670 |
|
1092 84d6ec6a8e21 |
|
1093 01f771406cab |
|
1094 $ checktopo Cfinal |
|
1095 === checking 1ea73414a91b === |
|
1096 === checking 66f7d451a68b === |
|
1097 === checking 01241442b3c2 === |
|
1098 === checking 0c1445abb33d === |
|
1099 === checking 65eb34ffc3a8 === |
|
1100 === checking 2dc09a01254d === |
|
1101 === checking bebd167eb94d === |
|
1102 === checking c8d03c1b5e94 === |
|
1103 === checking 07c648efceeb === |
|
1104 === checking c81423bf5a24 === |
|
1105 === checking 5ba9a53052ed === |
|
1106 === checking 3e2da24aee59 === |
|
1107 === checking 26f59ee8b1d7 === |
|
1108 === checking f7c6e7bfbcd0 === |
|
1109 === checking 39bab1cb1cbe === |
|
1110 === checking 55bf3fdb634f === |
|
1111 === checking 3e1560705803 === |
|
1112 === checking 17b6e6bac221 === |
|
1113 === checking 5ce588c2b7c5 === |
|
1114 === checking f2bdd828a3aa === |
|
1115 === checking a457569c5306 === |
|
1116 === checking ad46a4a0fc10 === |
|
1117 === checking 4f5078f7da8a === |
|
1118 === checking 01e29e20ea3f === |
|
1119 === checking 32b41ca704e1 === |
|
1120 === checking 29141354a762 === |
|
1121 === checking 9729470d9329 === |
|
1122 === checking 884936b34999 === |
|
1123 === checking 0484d39906c8 === |
|
1124 === checking 5eec91b12a58 === |
|
1125 === checking c84da74cf586 === |
|
1126 === checking 3871506da61e === |
|
1127 === checking 2bd677d0f13a === |
|
1128 === checking 3bdb00d5c818 === |
|
1129 === checking b9c3aa92fba5 === |
|
1130 === checking f3441cd3e664 === |
|
1131 === checking 0c3f2ba59eb7 === |
|
1132 === checking 2ea3fbf151b5 === |
|
1133 === checking 47c836a1f13e === |
|
1134 === checking 722d1b8b8942 === |
|
1135 === checking 4b39f229a0ce === |
|
1136 === checking d94da36be176 === |
|
1137 === checking eed373b0090d === |
|
1138 === checking 88714f4125cb === |
|
1139 === checking d928b4e8a515 === |
|
1140 === checking 88eace5ce682 === |
|
1141 === checking 698970a2480b === |
|
1142 === checking b115c694654e === |
|
1143 === checking 1f4a19f83a29 === |
|
1144 === checking 43fc0b77ff07 === |
|
1145 === checking 31d7b43cc321 === |
|
1146 === checking 673f5499c8c2 === |
|
1147 === checking 900dd066a072 === |
|
1148 === checking 97ac964e34b7 === |
|
1149 === checking 0d153e3ad632 === |
|
1150 === checking c37e7cd9f2bd === |
|
1151 === checking 9a67238ad1c4 === |
|
1152 === checking 8ecb28746ec4 === |
|
1153 === checking bf6593f7e073 === |
|
1154 === checking 0bab31f71a21 === |
|
1155 === checking 1da228afcf06 === |
|
1156 === checking bfcfd9a61e84 === |
|
1157 === checking d6c9e2d27f14 === |
|
1158 === checking de05b9c29ec7 === |
|
1159 === checking 40553f55397e === |
|
1160 === checking 4f3b41956174 === |
|
1161 === checking 37ad3ab0cddf === |
|
1162 === checking c7d3029bf731 === |
|
1163 === checking 76151e8066e1 === |
|
1164 === checking c7c1497fc270 === |
|
1165 === checking e7135b665740 === |
|
1166 === checking b33fd5ad4c0c === |
|
1167 === checking cd345198cf12 === |
|
1168 === checking 28be96b80dc1 === |
|
1169 === checking c713eae2d31f === |
|
1170 === checking 82238c0bc950 === |
|
1171 === checking dbde319d43a3 === |
|
1172 === checking 8b79544bb56d === |
|
1173 === checking d917f77a6439 === |
|
1174 === checking c3c7fa726f88 === |
|
1175 === checking 97d19fc5236f === |
|
1176 === checking 2472d042ec95 === |
|
1177 === checking d99e0f7dad5b === |
|
1178 === checking e4cfd6264623 === |
|
1179 === checking fac9e582edd1 === |
|
1180 === checking 89a0fe204177 === |
|
1181 === checking b3cf98c3d587 === |
|
1182 === checking 041e1188f5f1 === |
|
1183 === checking 721ba7c5f4ff === |
|
1184 === checking e3e6738c56ce === |
|
1185 === checking 790cdfecd168 === |
|
1186 === checking 469c700e9ed8 === |
|
1187 === checking 8ae32c3ed670 === |
|
1188 === checking 84d6ec6a8e21 === |
|
1189 === checking 01f771406cab === |
|
1190 |
|
1191 Test stability of this mess |
|
1192 --------------------------- |
|
1193 |
|
1194 $ hg log -r tip |
|
1195 94 01f771406cab r94 Cfinal tip |
|
1196 $ hg showsort --rev 'all()' > ../crisscross.source.order |
|
1197 $ cd .. |
|
1198 |
|
1199 $ hg clone crisscross_A crisscross_random --rev 0 |
|
1200 adding changesets |
|
1201 adding manifests |
|
1202 adding file changes |
|
1203 added 1 changesets with 0 changes to 0 files |
|
1204 updating to branch default |
|
1205 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1206 $ cd crisscross_random |
|
1207 $ for x in `python ../random_rev.py 50 44`; do |
|
1208 > # using python to benefit from the random seed |
|
1209 > hg pull -r $x --quiet |
|
1210 > done; |
|
1211 $ hg pull --quiet |
|
1212 |
|
1213 $ hg showsort --rev 'all()' > ../crisscross.random.order |
|
1214 $ python "$RUNTESTDIR/md5sum.py" ../crisscross.*.order |
|
1215 d9aab0d1907d5cf64d205a8b9036e959 ../crisscross.random.order |
|
1216 d9aab0d1907d5cf64d205a8b9036e959 ../crisscross.source.order |
|
1217 $ diff -u ../crisscross.*.order |
|
1218 $ hg showsort --rev 'all()' |
|
1219 1ea73414a91b |
|
1220 66f7d451a68b |
|
1221 01241442b3c2 |
|
1222 0c1445abb33d |
|
1223 65eb34ffc3a8 |
|
1224 2dc09a01254d |
|
1225 bebd167eb94d |
|
1226 c8d03c1b5e94 |
|
1227 07c648efceeb |
|
1228 c81423bf5a24 |
|
1229 5ba9a53052ed |
|
1230 3e2da24aee59 |
|
1231 26f59ee8b1d7 |
|
1232 f7c6e7bfbcd0 |
|
1233 39bab1cb1cbe |
|
1234 55bf3fdb634f |
|
1235 3e1560705803 |
|
1236 17b6e6bac221 |
|
1237 5ce588c2b7c5 |
|
1238 f2bdd828a3aa |
|
1239 a457569c5306 |
|
1240 ad46a4a0fc10 |
|
1241 4f5078f7da8a |
|
1242 01e29e20ea3f |
|
1243 32b41ca704e1 |
|
1244 29141354a762 |
|
1245 9729470d9329 |
|
1246 884936b34999 |
|
1247 0484d39906c8 |
|
1248 5eec91b12a58 |
|
1249 c84da74cf586 |
|
1250 3871506da61e |
|
1251 2bd677d0f13a |
|
1252 3bdb00d5c818 |
|
1253 b9c3aa92fba5 |
|
1254 f3441cd3e664 |
|
1255 0c3f2ba59eb7 |
|
1256 2ea3fbf151b5 |
|
1257 47c836a1f13e |
|
1258 722d1b8b8942 |
|
1259 4b39f229a0ce |
|
1260 d94da36be176 |
|
1261 eed373b0090d |
|
1262 88714f4125cb |
|
1263 d928b4e8a515 |
|
1264 88eace5ce682 |
|
1265 698970a2480b |
|
1266 b115c694654e |
|
1267 1f4a19f83a29 |
|
1268 43fc0b77ff07 |
|
1269 31d7b43cc321 |
|
1270 673f5499c8c2 |
|
1271 900dd066a072 |
|
1272 97ac964e34b7 |
|
1273 0d153e3ad632 |
|
1274 c37e7cd9f2bd |
|
1275 9a67238ad1c4 |
|
1276 8ecb28746ec4 |
|
1277 bf6593f7e073 |
|
1278 0bab31f71a21 |
|
1279 1da228afcf06 |
|
1280 bfcfd9a61e84 |
|
1281 d6c9e2d27f14 |
|
1282 de05b9c29ec7 |
|
1283 40553f55397e |
|
1284 4f3b41956174 |
|
1285 37ad3ab0cddf |
|
1286 c7d3029bf731 |
|
1287 76151e8066e1 |
|
1288 c7c1497fc270 |
|
1289 e7135b665740 |
|
1290 b33fd5ad4c0c |
|
1291 cd345198cf12 |
|
1292 28be96b80dc1 |
|
1293 c713eae2d31f |
|
1294 82238c0bc950 |
|
1295 dbde319d43a3 |
|
1296 8b79544bb56d |
|
1297 d917f77a6439 |
|
1298 c3c7fa726f88 |
|
1299 97d19fc5236f |
|
1300 2472d042ec95 |
|
1301 d99e0f7dad5b |
|
1302 e4cfd6264623 |
|
1303 fac9e582edd1 |
|
1304 89a0fe204177 |
|
1305 b3cf98c3d587 |
|
1306 041e1188f5f1 |
|
1307 721ba7c5f4ff |
|
1308 e3e6738c56ce |
|
1309 790cdfecd168 |
|
1310 469c700e9ed8 |
|
1311 8ae32c3ed670 |
|
1312 84d6ec6a8e21 |
|
1313 01f771406cab |
|
1314 |
|
1315 |
627 |
1316 Test behavior with oedipus merges |
628 Test behavior with oedipus merges |
1317 ================================= |
629 ================================= |
1318 |
630 |
1319 $ hg init recursion_oedipus |
631 $ hg init recursion_oedipus |