equal
deleted
inserted
replaced
734 U file2 |
734 U file2 |
735 --- debugmergestate --- |
735 --- debugmergestate --- |
736 * version 2 records |
736 * version 2 records |
737 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
737 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
738 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
738 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
739 labels: |
|
740 local: working copy |
|
741 other: destination |
739 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
742 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
740 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
743 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
741 local path: file1 (flags "") |
744 local path: file1 (flags "") |
742 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
745 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
743 other path: file1 (node null) |
746 other path: file1 (node null) |
774 R file2 |
777 R file2 |
775 --- debugmergestate --- |
778 --- debugmergestate --- |
776 * version 2 records |
779 * version 2 records |
777 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
780 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
778 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
781 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
782 labels: |
|
783 local: working copy |
|
784 other: destination |
779 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
785 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
780 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
786 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
781 local path: file1 (flags "") |
787 local path: file1 (flags "") |
782 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
788 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
783 other path: file1 (node null) |
789 other path: file1 (node null) |
812 R file2 |
818 R file2 |
813 --- debugmergestate --- |
819 --- debugmergestate --- |
814 * version 2 records |
820 * version 2 records |
815 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
821 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
816 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
822 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
823 labels: |
|
824 local: working copy |
|
825 other: destination |
817 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
826 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
818 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
827 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
819 local path: file1 (flags "") |
828 local path: file1 (flags "") |
820 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
829 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
821 other path: file1 (node null) |
830 other path: file1 (node null) |
852 U file2 |
861 U file2 |
853 --- debugmergestate --- |
862 --- debugmergestate --- |
854 * version 2 records |
863 * version 2 records |
855 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
864 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
856 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
865 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
866 labels: |
|
867 local: working copy |
|
868 other: destination |
857 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
869 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
858 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
870 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
859 local path: file1 (flags "") |
871 local path: file1 (flags "") |
860 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
872 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
861 other path: file1 (node null) |
873 other path: file1 (node null) |
898 U file2 |
910 U file2 |
899 --- debugmergestate --- |
911 --- debugmergestate --- |
900 * version 2 records |
912 * version 2 records |
901 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
913 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
902 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
914 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
915 labels: |
|
916 local: working copy |
|
917 other: destination |
903 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
918 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
904 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
919 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
905 local path: file1 (flags "") |
920 local path: file1 (flags "") |
906 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
921 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
907 other path: file1 (node null) |
922 other path: file1 (node null) |
945 U file2 |
960 U file2 |
946 --- debugmergestate --- |
961 --- debugmergestate --- |
947 * version 2 records |
962 * version 2 records |
948 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
963 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
949 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
964 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
965 labels: |
|
966 local: working copy |
|
967 other: destination |
950 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
968 file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) |
951 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
969 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
952 local path: file1 (flags "") |
970 local path: file1 (flags "") |
953 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
971 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
954 other path: file1 (node null) |
972 other path: file1 (node null) |