Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents e6ae5af97683 53d63b608230
children
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
754 754
755 $ hg evolve --phase-divergent --update 755 $ hg evolve --phase-divergent --update
756 recreate:[14] y to y and foobar to foo 756 recreate:[14] y to y and foobar to foo
757 atop:[12] y to y and foobar to foo 757 atop:[12] y to y and foobar to foo
758 rebasing to destination parent: 2352021b3785 758 rebasing to destination parent: 2352021b3785
759 committed as 8c2bb6fb44e9 759 committed as ec66af49a1a6
760 working directory is now at 8c2bb6fb44e9 760 working directory is now at ec66af49a1a6
761 761
762 $ hg exp 762 $ hg exp
763 # HG changeset patch 763 # HG changeset patch
764 # User test 764 # User test
765 # Date 0 0 765 # Date 0 0
766 # Thu Jan 01 00:00:00 1970 +0000 766 # Thu Jan 01 00:00:00 1970 +0000
767 # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 767 # Node ID ec66af49a1a643ef308fe11697c59c4920d2bd9e
768 # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b 768 # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b
769 phase-divergent update to dc88f5aa9bc9: 769 phase-divergent update to dc88f5aa9bc9:
770 770
771 y to y and foobar to foo 771 y to y and foobar to foo
772 772
773 diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y 773 diff -r dc88f5aa9bc9 -r ec66af49a1a6 y
774 --- a/y Thu Jan 01 00:00:00 1970 +0000 774 --- a/y Thu Jan 01 00:00:00 1970 +0000
775 +++ b/y Thu Jan 01 00:00:00 1970 +0000 775 +++ b/y Thu Jan 01 00:00:00 1970 +0000
776 @@ -1,1 +1,1 @@ 776 @@ -1,1 +1,1 @@
777 -y 777 -y
778 +foo 778 +foo
779 779
780 $ hg glog 780 $ hg glog
781 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 781 @ 16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
782 | () draft 782 | () draft
783 o 12:dc88f5aa9bc9 y to y and foobar to foo 783 o 12:dc88f5aa9bc9 y to y and foobar to foo
784 | () public 784 | () public
785 o 9:2352021b3785 added x to x 785 o 9:2352021b3785 added x to x
786 | (bm) public 786 | (bm) public
804 conflicts while rebasing on parent 804 conflicts while rebasing on parent
805 805
806 $ echo l > l 806 $ echo l > l
807 $ hg ci -Aqm "added l to l" 807 $ hg ci -Aqm "added l to l"
808 $ hg rebase -r . -d .^^^^ 808 $ hg rebase -r . -d .^^^^
809 rebasing 17:f3794e5a91dc "added l to l" (tip) 809 rebasing 17:c7c3e834e653 "added l to l" (tip)
810 $ echo kl > l 810 $ echo kl > l
811 $ echo foo > x 811 $ echo foo > x
812 $ hg add x 812 $ hg add x
813 $ hg amend 813 $ hg amend
814 814
822 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 822 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
823 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 823 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
824 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 824 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
825 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 825 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
826 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 826 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
827 13015a180eee523ba9950f18683762a77f560f3d 7687d2968b3e2697f955beac2da24ee879950cb9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 827 13015a180eee523ba9950f18683762a77f560f3d 7c9c658a311a5194f4826f91ae667b151263d192 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
828 7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 828 7c9c658a311a5194f4826f91ae667b151263d192 ec66af49a1a643ef308fe11697c59c4920d2bd9e 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
829 f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 829 c7c3e834e6538706672e2b5387a27efda6e0f00f 5c0ff97e7b93a7510a08eaf8ae3821448255963d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
830 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 830 5c0ff97e7b93a7510a08eaf8ae3821448255963d 4c2ba1e0fc47842138814c7e5dc64392bdf2d70e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
831 $ hg obslog -r . 831 $ hg obslog -r .
832 @ 5fd38c0de46e (19) added l to l 832 @ 4c2ba1e0fc47 (19) added l to l
833 | amended(content) from 2bfd56949cf0 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 833 | amended(content) from 5c0ff97e7b93 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
834 | 834 |
835 x 2bfd56949cf0 (18) added l to l 835 x 5c0ff97e7b93 (18) added l to l
836 | rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 836 | rebased(parent) from c7c3e834e653 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
837 | 837 |
838 x f3794e5a91dc (17) added l to l 838 x c7c3e834e653 (17) added l to l
839 839
840 840
841 $ hg phase -r f3794e5a91dc --public --hidden 841 $ hg phase -r c7c3e834e653 --public --hidden
842 1 new phase-divergent changesets 842 1 new phase-divergent changesets
843 843
844 Resolution using `hg evolve --phase-divergent` 844 Resolution using `hg evolve --phase-divergent`
845 ---------------------------------------------- 845 ----------------------------------------------
846 846
847 $ hg evolve --phase-divergent --update 847 $ hg evolve --phase-divergent --update
848 recreate:[19] added l to l 848 recreate:[19] added l to l
849 atop:[17] added l to l 849 atop:[17] added l to l
850 rebasing to destination parent: 8c2bb6fb44e9 850 rebasing to destination parent: ec66af49a1a6
851 merging x 851 merging x
852 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') 852 warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
853 unresolved merge conflicts 853 unresolved merge conflicts
854 (see 'hg help evolve.interrupted') 854 (see 'hg help evolve.interrupted')
855 [1] 855 [1]
856 856
857 $ hg diff 857 $ hg diff
858 diff -r 8c2bb6fb44e9 l 858 diff -r ec66af49a1a6 l
859 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 859 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
860 +++ b/l Thu Jan 01 00:00:00 1970 +0000 860 +++ b/l Thu Jan 01 00:00:00 1970 +0000
861 @@ -0,0 +1,1 @@ 861 @@ -0,0 +1,1 @@
862 +kl 862 +kl
863 diff -r 8c2bb6fb44e9 x 863 diff -r ec66af49a1a6 x
864 --- a/x Thu Jan 01 00:00:00 1970 +0000 864 --- a/x Thu Jan 01 00:00:00 1970 +0000
865 +++ b/x Thu Jan 01 00:00:00 1970 +0000 865 +++ b/x Thu Jan 01 00:00:00 1970 +0000
866 @@ -1,1 +1,5 @@ 866 @@ -1,1 +1,5 @@
867 +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9... 867 +<<<<<<< destination: ec66af49a1a6 - test: phase-divergent update to dc88f5aa9...
868 x 868 x
869 +======= 869 +=======
870 +foo 870 +foo
871 +>>>>>>> evolving: 5fd38c0de46e - test: added l to l 871 +>>>>>>> evolving: 4c2ba1e0fc47 - test: added l to l
872 872
873 $ echo foo > x 873 $ echo foo > x
874 874
875 $ hg resolve -m 875 $ hg resolve -m
876 (no more unresolved files) 876 (no more unresolved files)
877 continue: hg evolve --continue 877 continue: hg evolve --continue
878 878
879 $ hg evolve --continue 879 $ hg evolve --continue
880 evolving 19:5fd38c0de46e "added l to l" 880 evolving 19:4c2ba1e0fc47 "added l to l"
881 committed as e3090241a10c 881 committed as 4a3e0e3f88ca
882 working directory is now at e3090241a10c 882 working directory is now at 4a3e0e3f88ca
883 883
884 $ hg glog 884 $ hg glog
885 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 885 @ 21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
886 | () draft 886 | () draft
887 o 17:f3794e5a91dc added l to l 887 o 17:c7c3e834e653 added l to l
888 | () public 888 | () public
889 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 889 o 16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
890 | () public 890 | () public
891 o 12:dc88f5aa9bc9 y to y and foobar to foo 891 o 12:dc88f5aa9bc9 y to y and foobar to foo
892 | () public 892 | () public
893 o 9:2352021b3785 added x to x 893 o 9:2352021b3785 added x to x
894 | (bm) public 894 | (bm) public
908 $ hg exp 908 $ hg exp
909 # HG changeset patch 909 # HG changeset patch
910 # User test 910 # User test
911 # Date 0 0 911 # Date 0 0
912 # Thu Jan 01 00:00:00 1970 +0000 912 # Thu Jan 01 00:00:00 1970 +0000
913 # Node ID e3090241a10c320b6132e4673915fd6b19c0de39 913 # Node ID 4a3e0e3f88ca7c24f3b9f54abfbb49a314fe4c0b
914 # Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48 914 # Parent c7c3e834e6538706672e2b5387a27efda6e0f00f
915 phase-divergent update to f3794e5a91dc: 915 phase-divergent update to c7c3e834e653:
916 916
917 added l to l 917 added l to l
918 918
919 diff -r f3794e5a91dc -r e3090241a10c l 919 diff -r c7c3e834e653 -r 4a3e0e3f88ca l
920 --- a/l Thu Jan 01 00:00:00 1970 +0000 920 --- a/l Thu Jan 01 00:00:00 1970 +0000
921 +++ b/l Thu Jan 01 00:00:00 1970 +0000 921 +++ b/l Thu Jan 01 00:00:00 1970 +0000
922 @@ -1,1 +1,1 @@ 922 @@ -1,1 +1,1 @@
923 -l 923 -l
924 +kl 924 +kl
925 diff -r f3794e5a91dc -r e3090241a10c x 925 diff -r c7c3e834e653 -r 4a3e0e3f88ca x
926 --- a/x Thu Jan 01 00:00:00 1970 +0000 926 --- a/x Thu Jan 01 00:00:00 1970 +0000
927 +++ b/x Thu Jan 01 00:00:00 1970 +0000 927 +++ b/x Thu Jan 01 00:00:00 1970 +0000
928 @@ -1,1 +1,1 @@ 928 @@ -1,1 +1,1 @@
929 -x 929 -x
930 +foo 930 +foo
931 931
932 Creating phase divergence when couple of changesets are folded into one 932 Creating phase divergence when couple of changesets are folded into one
933 ------------------------------------------------------------------------ 933 ------------------------------------------------------------------------
934 934
935 $ hg glog -r . 935 $ hg glog -r .
936 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 936 @ 21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
937 | () draft 937 | () draft
938 ~ 938 ~
939 $ echo f > f 939 $ echo f > f
940 $ hg ci -Aqm "added f" 940 $ hg ci -Aqm "added f"
941 $ echo g > g 941 $ echo g > g
945 2 changesets folded 945 2 changesets folded
946 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 946 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
947 947
948 $ hg evolve --list 948 $ hg evolve --list
949 949
950 $ hg phase -r 428f7900a969 --public --hidden 950 $ hg phase -r 898734e41932 --public --hidden
951 1 new phase-divergent changesets 951 1 new phase-divergent changesets
952 952
953 $ hg glog -r f3794e5a91dc:: 953 $ hg glog -r c7c3e834e653::
954 @ 24:390acb97e50a added f 954 @ 24:5dfcf4a7c095 added f
955 | () draft 955 | () draft
956 | o 23:428f7900a969 added g 956 | o 23:898734e41932 added g
957 | | () public 957 | | () public
958 | o 22:21ae52e414e6 added f 958 | o 22:54c60ee8ecb8 added f
959 |/ () public 959 |/ () public
960 o 21:e3090241a10c phase-divergent update to f3794e5a91dc: 960 o 21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
961 | () public 961 | () public
962 o 17:f3794e5a91dc added l to l 962 o 17:c7c3e834e653 added l to l
963 | () public 963 | () public
964 ~ 964 ~
965 965
966 $ hg evolve --list 966 $ hg evolve --list
967 390acb97e50a: added f 967 5dfcf4a7c095: added f
968 phase-divergent: 21ae52e414e6 (immutable precursor) 968 phase-divergent: 54c60ee8ecb8 (immutable precursor)
969 phase-divergent: 428f7900a969 (immutable precursor) 969 phase-divergent: 898734e41932 (immutable precursor)
970 970
971 Resolving phase divergence using `hg evolve` 971 Resolving phase divergence using `hg evolve`
972 972
973 $ hg evolve --phase-divergent --all 973 $ hg evolve --phase-divergent --all
974 recreate:[24] added f 974 recreate:[24] added f
975 atop:[23] added g 975 atop:[23] added g
976 rebasing to destination parent: 21ae52e414e6 976 rebasing to destination parent: 54c60ee8ecb8
977 no changes to commit 977 no changes to commit
978 working directory is now at e3090241a10c 978 working directory is now at 4a3e0e3f88ca
979 979
980 $ hg glog -r f3794e5a91dc:: 980 $ hg glog -r c7c3e834e653::
981 o 23:428f7900a969 added g 981 o 23:898734e41932 added g
982 | () public 982 | () public
983 o 22:21ae52e414e6 added f 983 o 22:54c60ee8ecb8 added f
984 | () public 984 | () public
985 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 985 @ 21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
986 | () public 986 | () public
987 o 17:f3794e5a91dc added l to l 987 o 17:c7c3e834e653 added l to l
988 | () public 988 | () public
989 ~ 989 ~
990 990
991 When the public changesets is split causing phase-divergence 991 When the public changesets is split causing phase-divergence
992 ------------------------------------------------------------ 992 ------------------------------------------------------------
1313 atop:[1] added m and n 1313 atop:[1] added m and n
1314 committed as 86419909e017 1314 committed as 86419909e017
1315 recreate:[4] added n 1315 recreate:[4] added n
1316 atop:[1] added m and n 1316 atop:[1] added m and n
1317 rebasing to destination parent: d3873e73d99e 1317 rebasing to destination parent: d3873e73d99e
1318 committed as 88b0dae5369a 1318 committed as 0f21d47fe960
1319 working directory is now at 88b0dae5369a 1319 working directory is now at 0f21d47fe960
1320 1320
1321 $ hg glog --hidden 1321 $ hg glog --hidden
1322 @ 7:88b0dae5369a phase-divergent update to a51bce62c219: 1322 @ 7:0f21d47fe960 phase-divergent update to a51bce62c219:
1323 | () draft 1323 | () draft
1324 | x 6:98dad8812511 added n 1324 | x 6:302a3ecef922 added n
1325 | | () draft 1325 | | () draft
1326 +---o 5:86419909e017 phase-divergent update to a51bce62c219: 1326 +---o 5:86419909e017 phase-divergent update to a51bce62c219:
1327 | | () draft 1327 | | () draft
1328 | | x 4:52ca78bb98c7 added n 1328 | | x 4:52ca78bb98c7 added n
1329 | | | () draft 1329 | | | () draft
1338 1338
1339 $ hg debugobsolete 1339 $ hg debugobsolete
1340 a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 1340 a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
1341 e1154ec0206ac05c3765f7bd1337e3b96db2974f 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 1341 e1154ec0206ac05c3765f7bd1337e3b96db2974f 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
1342 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1342 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1343 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 1343 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
1344 98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1344 302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0f21d47fe96059e134fd230d6d1623ff1d541963 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1345 $ hg obslog -r a51bce62c219 --all 1345 $ hg obslog -r a51bce62c219 --all
1346 o 86419909e017 (5) phase-divergent update to a51bce62c219: 1346 @ 0f21d47fe960 (7) phase-divergent update to a51bce62c219:
1347 | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1347 | rewritten(description, parent, content) from 302a3ecef922 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1348 | 1348 |
1349 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: 1349 | o 86419909e017 (5) phase-divergent update to a51bce62c219:
1350 | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1350 | | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1351 | | 1351 | |
1352 x | 4f25cd9cd2bf (2) added m 1352 x | 302a3ecef922 (6) added n
1353 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1354 | |
1355 | x 4f25cd9cd2bf (2) added m
1353 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 1356 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1354 | | 1357 | |
1355 | x 98dad8812511 (6) added n 1358 x | 52ca78bb98c7 (4) added n
1356 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1357 | |
1358 | x 52ca78bb98c7 (4) added n
1359 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1359 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1360 | | 1360 | |
1361 | x e1154ec0206a (3) added n 1361 x | e1154ec0206a (3) added n
1362 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 1362 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1363 | 1363 |
1364 o a51bce62c219 (1) added m and n 1364 o a51bce62c219 (1) added m and n
1365 1365
1366 1366
1381 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1381 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1382 @@ -1,1 +0,0 @@ 1382 @@ -1,1 +0,0 @@
1383 -n 1383 -n
1384 1384
1385 XXX: not sure this is correct 1385 XXX: not sure this is correct
1386 $ hg exp 88b0dae5369a 1386 $ hg exp 0f21d47fe960
1387 # HG changeset patch 1387 # HG changeset patch
1388 # User test 1388 # User test
1389 # Date 0 0 1389 # Date 0 0
1390 # Thu Jan 01 00:00:00 1970 +0000 1390 # Thu Jan 01 00:00:00 1970 +0000
1391 # Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1391 # Node ID 0f21d47fe96059e134fd230d6d1623ff1d541963
1392 # Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 1392 # Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
1393 phase-divergent update to a51bce62c219: 1393 phase-divergent update to a51bce62c219:
1394 1394
1395 added n 1395 added n
1396 1396
1397 diff -r a51bce62c219 -r 88b0dae5369a m 1397 diff -r a51bce62c219 -r 0f21d47fe960 m
1398 --- a/m Thu Jan 01 00:00:00 1970 +0000 1398 --- a/m Thu Jan 01 00:00:00 1970 +0000
1399 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1399 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1400 @@ -1,1 +0,0 @@ 1400 @@ -1,1 +0,0 @@
1401 -m 1401 -m
1402 diff -r a51bce62c219 -r 88b0dae5369a n 1402 diff -r a51bce62c219 -r 0f21d47fe960 n
1403 --- a/n Thu Jan 01 00:00:00 1970 +0000 1403 --- a/n Thu Jan 01 00:00:00 1970 +0000
1404 +++ b/n Thu Jan 01 00:00:00 1970 +0000 1404 +++ b/n Thu Jan 01 00:00:00 1970 +0000
1405 @@ -1,1 +1,1 @@ 1405 @@ -1,1 +1,1 @@
1406 -n 1406 -n
1407 +n2 1407 +n2