Show More
@@ -6,7 +6,7 b' Enable obsolete' | |||||
6 |
|
6 | |||
7 | $ cat >> $HGRCPATH << EOF |
|
7 | $ cat >> $HGRCPATH << EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate= {rev}:{node|short} {desc|firstline} |
|
9 | > logtemplate= {rev}:{node|short} {desc|firstline}{if(obsolete,' ({obsfate})')} | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 | > evolution.createmarkers=True |
|
11 | > evolution.createmarkers=True | |
12 | > evolution.allowunstable=True |
|
12 | > evolution.allowunstable=True | |
@@ -94,11 +94,11 b' simple rebase' | |||||
94 | | | |
|
94 | | | | |
95 | o | 4:9520eea781bc E |
|
95 | o | 4:9520eea781bc E | |
96 | |/ |
|
96 | |/ | |
97 | | x 3:32af7686d403 D |
|
97 | | x 3:32af7686d403 D (rewritten using rebase as 10:8eeb3c33ad33) | |
98 | | | |
|
98 | | | | |
99 | | x 2:5fddd98957c8 C |
|
99 | | x 2:5fddd98957c8 C (rewritten using rebase as 9:2327fea05063) | |
100 | | | |
|
100 | | | | |
101 | | x 1:42ccdea3bb16 B |
|
101 | | x 1:42ccdea3bb16 B (rewritten using rebase as 8:e4e5be0395b2) | |
102 | |/ |
|
102 | |/ | |
103 | o 0:cd010b8cd998 A |
|
103 | o 0:cd010b8cd998 A | |
104 |
|
104 | |||
@@ -164,11 +164,11 b' set.' | |||||
164 | | | |
|
164 | | | | |
165 | o | 4:9520eea781bc E |
|
165 | o | 4:9520eea781bc E | |
166 | |/ |
|
166 | |/ | |
167 | | x 3:32af7686d403 D |
|
167 | | x 3:32af7686d403 D (pruned using rebase) | |
168 | | | |
|
168 | | | | |
169 | | x 2:5fddd98957c8 C |
|
169 | | x 2:5fddd98957c8 C (rewritten using rebase as 10:5ae4c968c6ac) | |
170 | | | |
|
170 | | | | |
171 | | x 1:42ccdea3bb16 B |
|
171 | | x 1:42ccdea3bb16 B (pruned using rebase) | |
172 | |/ |
|
172 | |/ | |
173 | o 0:cd010b8cd998 A |
|
173 | o 0:cd010b8cd998 A | |
174 |
|
174 | |||
@@ -192,7 +192,7 b' More complex case where part of the reba' | |||||
192 | | |
|
192 | | | |
193 | | o 10:5ae4c968c6ac C |
|
193 | | o 10:5ae4c968c6ac C | |
194 | | | |
|
194 | | | | |
195 | | x 9:08483444fef9 D |
|
195 | | x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43) | |
196 | | | |
|
196 | | | | |
197 | | o 8:8877864f1edb B |
|
197 | | o 8:8877864f1edb B | |
198 | | | |
|
198 | | | | |
@@ -299,7 +299,7 b" even though it is hidden (until we're mo" | |||||
299 | | | |
|
299 | | | | |
300 | o | 4:9520eea781bc E |
|
300 | o | 4:9520eea781bc E | |
301 | |/ |
|
301 | |/ | |
302 | | @ 1:42ccdea3bb16 B |
|
302 | | @ 1:42ccdea3bb16 B (pruned using rebase) | |
303 | |/ |
|
303 | |/ | |
304 | o 0:cd010b8cd998 A |
|
304 | o 0:cd010b8cd998 A | |
305 |
|
305 | |||
@@ -341,11 +341,11 b' collapse rebase' | |||||
341 | | | |
|
341 | | | | |
342 | o | 4:9520eea781bc E |
|
342 | o | 4:9520eea781bc E | |
343 | |/ |
|
343 | |/ | |
344 | | x 3:32af7686d403 D |
|
344 | | x 3:32af7686d403 D (rewritten using rebase as 8:4dc2197e807b) | |
345 | | | |
|
345 | | | | |
346 | | x 2:5fddd98957c8 C |
|
346 | | x 2:5fddd98957c8 C (rewritten using rebase as 8:4dc2197e807b) | |
347 | | | |
|
347 | | | | |
348 | | x 1:42ccdea3bb16 B |
|
348 | | x 1:42ccdea3bb16 B (rewritten using rebase as 8:4dc2197e807b) | |
349 | |/ |
|
349 | |/ | |
350 | o 0:cd010b8cd998 A |
|
350 | o 0:cd010b8cd998 A | |
351 |
|
351 | |||
@@ -405,11 +405,11 b' be rebased.' | |||||
405 | | | |
|
405 | | | | |
406 | | o 4:9520eea781bc E |
|
406 | | o 4:9520eea781bc E | |
407 | |/ |
|
407 | |/ | |
408 | | x 3:32af7686d403 D |
|
408 | | x 3:32af7686d403 D (rewritten using rebase as 9:cf44d2f5a9f4) | |
409 | | | |
|
409 | | | | |
410 | | x 2:5fddd98957c8 C |
|
410 | | x 2:5fddd98957c8 C (rewritten using rebase as 8:e273c5e7d2d2) | |
411 | | | |
|
411 | | | | |
412 | | x 1:42ccdea3bb16 B |
|
412 | | x 1:42ccdea3bb16 B (rewritten using rebase as 10:7c6027df6a99) | |
413 | |/ |
|
413 | |/ | |
414 | o 0:cd010b8cd998 A |
|
414 | o 0:cd010b8cd998 A | |
415 |
|
415 | |||
@@ -432,7 +432,7 b' Test that rewriting leaving instability ' | |||||
432 | | |
|
432 | | | |
433 | | o 9:cf44d2f5a9f4 D |
|
433 | | o 9:cf44d2f5a9f4 D | |
434 | | | |
|
434 | | | | |
435 | | x 8:e273c5e7d2d2 C |
|
435 | | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c) | |
436 | | | |
|
436 | | | | |
437 | @ | 7:02de42196ebe H |
|
437 | @ | 7:02de42196ebe H | |
438 | | | |
|
438 | | | | |
@@ -462,7 +462,7 b' Test multiple root handling' | |||||
462 | |/ |
|
462 | |/ | |
463 | | o 10:7c6027df6a99 B |
|
463 | | o 10:7c6027df6a99 B | |
464 | | | |
|
464 | | | | |
465 | | x 7:02de42196ebe H |
|
465 | | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697) | |
466 | | | |
|
466 | | | | |
467 | +---o 6:eea13746799a G |
|
467 | +---o 6:eea13746799a G | |
468 | | |/ |
|
468 | | |/ | |
@@ -556,7 +556,7 b' test on rebase dropping a merge' | |||||
556 | |/ |
|
556 | |/ | |
557 | | o 8:53a6a128b2b7 M |
|
557 | | o 8:53a6a128b2b7 M | |
558 | | |\ |
|
558 | | |\ | |
559 | | | x 7:02de42196ebe H |
|
559 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
560 | | | | |
|
560 | | | | | |
561 | o---+ 6:eea13746799a G |
|
561 | o---+ 6:eea13746799a G | |
562 | | | | |
|
562 | | | | | |
@@ -564,7 +564,7 b' test on rebase dropping a merge' | |||||
564 | | | | |
|
564 | | | | | |
565 | o---+ 4:9520eea781bc E |
|
565 | o---+ 4:9520eea781bc E | |
566 | / / |
|
566 | / / | |
567 | x | 3:32af7686d403 D |
|
567 | x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e) | |
568 | | | |
|
568 | | | | |
569 | o | 2:5fddd98957c8 C |
|
569 | o | 2:5fddd98957c8 C | |
570 | | | |
|
570 | | | | |
@@ -599,7 +599,7 b' Test hidden changesets in the rebase set' | |||||
599 | |/ |
|
599 | |/ | |
600 | | o 8:53a6a128b2b7 M |
|
600 | | o 8:53a6a128b2b7 M | |
601 | | |\ |
|
601 | | |\ | |
602 | | | x 7:02de42196ebe H |
|
602 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
603 | | | | |
|
603 | | | | | |
604 | o---+ 6:eea13746799a G |
|
604 | o---+ 6:eea13746799a G | |
605 | | | | |
|
605 | | | | | |
@@ -607,7 +607,7 b' Test hidden changesets in the rebase set' | |||||
607 | | | | |
|
607 | | | | | |
608 | o---+ 4:9520eea781bc E |
|
608 | o---+ 4:9520eea781bc E | |
609 | / / |
|
609 | / / | |
610 | x | 3:32af7686d403 D |
|
610 | x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e) | |
611 | | | |
|
611 | | | | |
612 | o | 2:5fddd98957c8 C |
|
612 | o | 2:5fddd98957c8 C | |
613 | | | |
|
613 | | | | |
@@ -633,11 +633,11 b' Test hidden changesets in the rebase set' | |||||
633 | | |
|
633 | | | |
634 | | o 17:97219452e4bd L |
|
634 | | o 17:97219452e4bd L | |
635 | | | |
|
635 | | | | |
636 | | x 16:fc37a630c901 K |
|
636 | | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) | |
637 | |/ |
|
637 | |/ | |
638 | | o 15:5ae8a643467b J |
|
638 | | o 15:5ae8a643467b J | |
639 | | | |
|
639 | | | | |
640 | | x 14:9ad579b4a5de I |
|
640 | | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901) | |
641 | |/ |
|
641 | |/ | |
642 | | o 12:acd174b7ab39 I |
|
642 | | o 12:acd174b7ab39 I | |
643 | | | |
|
643 | | | | |
@@ -647,7 +647,7 b' Test hidden changesets in the rebase set' | |||||
647 | |/ |
|
647 | |/ | |
648 | | o 8:53a6a128b2b7 M |
|
648 | | o 8:53a6a128b2b7 M | |
649 | | |\ |
|
649 | | |\ | |
650 | | | x 7:02de42196ebe H |
|
650 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
651 | | | | |
|
651 | | | | | |
652 | o---+ 6:eea13746799a G |
|
652 | o---+ 6:eea13746799a G | |
653 | | | | |
|
653 | | | | | |
@@ -655,7 +655,7 b' Test hidden changesets in the rebase set' | |||||
655 | | | | |
|
655 | | | | | |
656 | o---+ 4:9520eea781bc E |
|
656 | o---+ 4:9520eea781bc E | |
657 | / / |
|
657 | / / | |
658 | x | 3:32af7686d403 D |
|
658 | x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e) | |
659 | | | |
|
659 | | | | |
660 | o | 2:5fddd98957c8 C |
|
660 | o | 2:5fddd98957c8 C | |
661 | | | |
|
661 | | | | |
@@ -806,7 +806,7 b' If a rebase is going to create divergenc' | |||||
806 | | | |
|
806 | | | | |
807 | | | o 12:3eb461388009 john doe |
|
807 | | | o 12:3eb461388009 john doe | |
808 | | |/ |
|
808 | | |/ | |
809 | x | 10:121d9e3bc4c6 P |
|
809 | x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) | |
810 | |/ |
|
810 | |/ | |
811 | o 9:4be60e099a77 C |
|
811 | o 9:4be60e099a77 C | |
812 | | |
|
812 | | | |
@@ -835,7 +835,7 b' If a rebase is going to create divergenc' | |||||
835 | | | |
|
835 | | | | |
836 | | | o 12:3eb461388009 john doe |
|
836 | | | o 12:3eb461388009 john doe | |
837 | | |/ |
|
837 | | |/ | |
838 | x | 10:121d9e3bc4c6 P |
|
838 | x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) | |
839 | |/ |
|
839 | |/ | |
840 | o 9:4be60e099a77 C |
|
840 | o 9:4be60e099a77 C | |
841 | | |
|
841 | | | |
@@ -893,7 +893,7 b' Create the changes that we will rebase' | |||||
893 | $ hg log -G -r 16:: |
|
893 | $ hg log -G -r 16:: | |
894 | @ 21:7bdc8a87673d dummy change |
|
894 | @ 21:7bdc8a87673d dummy change | |
895 | | |
|
895 | | | |
896 | x 20:8b31da3c4919 dummy change |
|
896 | x 20:8b31da3c4919 dummy change (rewritten as 18:601db7a18f51) | |
897 | | |
|
897 | | | |
898 | o 19:b82fb57ea638 willconflict second version |
|
898 | o 19:b82fb57ea638 willconflict second version | |
899 | | |
|
899 | | | |
@@ -939,11 +939,11 b' Rebase merge where successor of one pare' | |||||
939 | $ hg log -G |
|
939 | $ hg log -G | |
940 | o 5:50e9d60b99c6 F |
|
940 | o 5:50e9d60b99c6 F | |
941 | |\ |
|
941 | |\ | |
942 | | | x 4:66f1a38021c9 F |
|
942 | | | x 4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6) | |
943 | | |/| |
|
943 | | |/| | |
944 | | o | 3:7fb047a69f22 E |
|
944 | | o | 3:7fb047a69f22 E | |
945 | | | | |
|
945 | | | | | |
946 | | | x 2:b18e25de2cf5 D |
|
946 | | | x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | |
947 | | |/ |
|
947 | | |/ | |
948 | o | 1:112478962961 B |
|
948 | o | 1:112478962961 B | |
949 | |/ |
|
949 | |/ | |
@@ -970,9 +970,9 b' Rebase merge where successor of other pa' | |||||
970 | $ hg log -G |
|
970 | $ hg log -G | |
971 | o 5:aae1787dacee F |
|
971 | o 5:aae1787dacee F | |
972 | |\ |
|
972 | |\ | |
973 | | | x 4:66f1a38021c9 F |
|
973 | | | x 4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee) | |
974 | | |/| |
|
974 | | |/| | |
975 | | | x 3:7fb047a69f22 E |
|
975 | | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | |
976 | | | | |
|
976 | | | | | |
977 | | o | 2:b18e25de2cf5 D |
|
977 | | o | 2:b18e25de2cf5 D | |
978 | | |/ |
|
978 | | |/ | |
@@ -1002,13 +1002,13 b' Rebase merge where successor of one pare' | |||||
1002 | $ hg log -G |
|
1002 | $ hg log -G | |
1003 | o 6:0913febf6439 F |
|
1003 | o 6:0913febf6439 F | |
1004 | |\ |
|
1004 | |\ | |
1005 | +---x 5:66f1a38021c9 F |
|
1005 | +---x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439) | |
1006 | | | | |
|
1006 | | | | | |
1007 | | o | 4:26805aba1e60 C |
|
1007 | | o | 4:26805aba1e60 C | |
1008 | | | | |
|
1008 | | | | | |
1009 | o | | 3:7fb047a69f22 E |
|
1009 | o | | 3:7fb047a69f22 E | |
1010 | | | | |
|
1010 | | | | | |
1011 | +---x 2:b18e25de2cf5 D |
|
1011 | +---x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | |
1012 | | | |
|
1012 | | | | |
1013 | | o 1:112478962961 B |
|
1013 | | o 1:112478962961 B | |
1014 | |/ |
|
1014 | |/ | |
@@ -1035,11 +1035,11 b' Rebase merge where successor of other pa' | |||||
1035 | $ hg log -G |
|
1035 | $ hg log -G | |
1036 | o 6:c6ab0cc6d220 F |
|
1036 | o 6:c6ab0cc6d220 F | |
1037 | |\ |
|
1037 | |\ | |
1038 | +---x 5:66f1a38021c9 F |
|
1038 | +---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220) | |
1039 | | | | |
|
1039 | | | | | |
1040 | | o | 4:26805aba1e60 C |
|
1040 | | o | 4:26805aba1e60 C | |
1041 | | | | |
|
1041 | | | | | |
1042 | | | x 3:7fb047a69f22 E |
|
1042 | | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | |
1043 | | | | |
|
1043 | | | | | |
1044 | o---+ 2:b18e25de2cf5 D |
|
1044 | o---+ 2:b18e25de2cf5 D | |
1045 | / / |
|
1045 | / / | |
@@ -1070,13 +1070,13 b' Rebase merge where successor of one pare' | |||||
1070 | $ hg log -G |
|
1070 | $ hg log -G | |
1071 | o 6:8f47515dda15 D |
|
1071 | o 6:8f47515dda15 D | |
1072 | | |
|
1072 | | | |
1073 | | x 5:66f1a38021c9 F |
|
1073 | | x 5:66f1a38021c9 F (pruned using rebase) | |
1074 | | |\ |
|
1074 | | |\ | |
1075 | o | | 4:26805aba1e60 C |
|
1075 | o | | 4:26805aba1e60 C | |
1076 | | | | |
|
1076 | | | | | |
1077 | | | x 3:7fb047a69f22 E |
|
1077 | | | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | |
1078 | | | | |
|
1078 | | | | | |
1079 | | x | 2:b18e25de2cf5 D |
|
1079 | | x | 2:b18e25de2cf5 D (rewritten using rebase as 6:8f47515dda15) | |
1080 | | |/ |
|
1080 | | |/ | |
1081 | o / 1:112478962961 B |
|
1081 | o / 1:112478962961 B | |
1082 | |/ |
|
1082 | |/ | |
@@ -1106,13 +1106,13 b' Rebase merge where successor of other pa' | |||||
1106 | $ hg log -G |
|
1106 | $ hg log -G | |
1107 | o 6:533690786a86 E |
|
1107 | o 6:533690786a86 E | |
1108 | | |
|
1108 | | | |
1109 | | x 5:66f1a38021c9 F |
|
1109 | | x 5:66f1a38021c9 F (pruned using rebase) | |
1110 | | |\ |
|
1110 | | |\ | |
1111 | o | | 4:26805aba1e60 C |
|
1111 | o | | 4:26805aba1e60 C | |
1112 | | | | |
|
1112 | | | | | |
1113 | | | x 3:7fb047a69f22 E |
|
1113 | | | x 3:7fb047a69f22 E (rewritten using rebase as 6:533690786a86) | |
1114 | | | | |
|
1114 | | | | | |
1115 | | x | 2:b18e25de2cf5 D |
|
1115 | | x | 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | |
1116 | | |/ |
|
1116 | | |/ | |
1117 | o / 1:112478962961 B |
|
1117 | o / 1:112478962961 B | |
1118 | |/ |
|
1118 | |/ | |
@@ -1224,7 +1224,7 b' equivalents in destination' | |||||
1224 | $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now |
|
1224 | $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now | |
1225 | $ hg up 2 && hg log -r . # working dir is at rev 2 again |
|
1225 | $ hg up 2 && hg log -r . # working dir is at rev 2 again | |
1226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1227 | 2:1e9a3c00cbe9 b (no-eol) |
|
1227 | 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) | |
1228 | $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 |
|
1228 | $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 | |
1229 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) |
|
1229 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) | |
1230 | Check that working directory and bookmark was updated to rev 3 although rev 2 |
|
1230 | Check that working directory and bookmark was updated to rev 3 although rev 2 | |
@@ -1338,7 +1338,7 b' rebasestate may contain hidden hashes. "' | |||||
1338 | $ hg log -G |
|
1338 | $ hg log -G | |
1339 | @ 2:b18e25de2cf5 D |
|
1339 | @ 2:b18e25de2cf5 D | |
1340 | | |
|
1340 | | | |
1341 | | @ 1:2ec65233581b B |
|
1341 | | @ 1:2ec65233581b B (pruned using prune) | |
1342 | |/ |
|
1342 | |/ | |
1343 | o 0:426bada5c675 A |
|
1343 | o 0:426bada5c675 A | |
1344 |
|
1344 |
General Comments 0
You need to be logged in to leave comments.
Login now