Mercurial > hg

comparison tests/test-rebase-obsolete.t @ 35508:9b3f95d9783d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphlog: add another graph node type, unstable, using character "*" (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 22 Dec 2017 23:17:04 +0800
parents 4441705b7111
children 02fdb8c018aa
comparison
equal deleted inserted replaced
35507:95a9be56c3bb 35508:9b3f95d9783d
188 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 188 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
189 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 189 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
190 $ hg log -G 190 $ hg log -G
191 @ 11:4596109a6a43 D 191 @ 11:4596109a6a43 D
192 | 192 |
193 | o 10:5ae4c968c6ac C 193 | * 10:5ae4c968c6ac C
194 | | 194 | |
195 | x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43) 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 | |
462 $ hg log -G 462 $ hg log -G
463 o 11:0d8f238b634c C 463 o 11:0d8f238b634c C
464 | 464 |
465 o 10:7c6027df6a99 B 465 o 10:7c6027df6a99 B
466 | 466 |
467 | o 9:cf44d2f5a9f4 D 467 | * 9:cf44d2f5a9f4 D
468 | | 468 | |
469 | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c) 469 | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c)
470 | | 470 | |
471 @ | 7:02de42196ebe H 471 @ | 7:02de42196ebe H
472 | | 472 | |
492 | 492 |
493 @ 13:bfe264faf697 H 493 @ 13:bfe264faf697 H
494 | 494 |
495 | o 12:102b4c1d889b D 495 | o 12:102b4c1d889b D
496 |/ 496 |/
497 | o 10:7c6027df6a99 B 497 | * 10:7c6027df6a99 B
498 | | 498 | |
499 | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697) 499 | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697)
500 | | 500 | |
501 +---o 6:eea13746799a G 501 +---o 6:eea13746799a G
502 | |/ 502 | |/
586 | 586 |
587 o 11:6c11a6218c97 H 587 o 11:6c11a6218c97 H
588 | 588 |
589 | o 10:b5313c85b22e D 589 | o 10:b5313c85b22e D
590 |/ 590 |/
591 | o 8:53a6a128b2b7 M 591 | * 8:53a6a128b2b7 M
592 | |\ 592 | |\
593 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) 593 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
594 | | | 594 | | |
595 o---+ 6:eea13746799a G 595 o---+ 6:eea13746799a G
596 | | | 596 | | |
621 rebasing 9:4bde274eefcf "I" 621 rebasing 9:4bde274eefcf "I"
622 rebasing 13:06edfc82198f "J" (tip) 622 rebasing 13:06edfc82198f "J" (tip)
623 $ hg log -G 623 $ hg log -G
624 @ 15:5ae8a643467b J 624 @ 15:5ae8a643467b J
625 | 625 |
626 o 14:9ad579b4a5de I 626 * 14:9ad579b4a5de I
627 | 627 |
628 | o 12:acd174b7ab39 I 628 | * 12:acd174b7ab39 I
629 | | 629 | |
630 | o 11:6c11a6218c97 H 630 | o 11:6c11a6218c97 H
631 | | 631 | |
632 o | 10:b5313c85b22e D 632 o | 10:b5313c85b22e D
633 |/ 633 |/
634 | o 8:53a6a128b2b7 M 634 | * 8:53a6a128b2b7 M
635 | |\ 635 | |\
636 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) 636 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
637 | | | 637 | | |
638 o---+ 6:eea13746799a G 638 o---+ 6:eea13746799a G
639 | | | 639 | | |
663 $ hg add M 663 $ hg add M
664 $ hg commit --amend -m "M" 664 $ hg commit --amend -m "M"
665 $ hg log -G 665 $ hg log -G
666 @ 18:bfaedf8eb73b M 666 @ 18:bfaedf8eb73b M
667 | 667 |
668 | o 17:97219452e4bd L 668 | * 17:97219452e4bd L
669 | | 669 | |
670 | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) 670 | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
671 |/ 671 |/
672 | o 15:5ae8a643467b J 672 | * 15:5ae8a643467b J
673 | | 673 | |
674 | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901) 674 | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
675 |/ 675 |/
676 | o 12:acd174b7ab39 I 676 | * 12:acd174b7ab39 I
677 | | 677 | |
678 | o 11:6c11a6218c97 H 678 | o 11:6c11a6218c97 H
679 | | 679 | |
680 o | 10:b5313c85b22e D 680 o | 10:b5313c85b22e D
681 |/ 681 |/
682 | o 8:53a6a128b2b7 M 682 | * 8:53a6a128b2b7 M
683 | |\ 683 | |\
684 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) 684 | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
685 | | | 685 | | |
686 o---+ 6:eea13746799a G 686 o---+ 6:eea13746799a G
687 | | | 687 | | |
1014 > x b 1014 > x b
1015 > \| 1015 > \|
1016 > a 1016 > a
1017 > EOF 1017 > EOF
1018 $ hg log -G -r 'a':: 1018 $ hg log -G -r 'a'::
1019 o 7:1143e9adc121 f 1019 * 7:1143e9adc121 f
1020 | 1020 |
1021 | o 6:d60ebfa0f1cb e 1021 | o 6:d60ebfa0f1cb e
1022 | | 1022 | |
1023 | o 5:027ad6c5830d d' 1023 | o 5:027ad6c5830d d'
1024 | | 1024 | |
1050 | 1050 |
1051 o 9:d008e6b4d3fd c 1051 o 9:d008e6b4d3fd c
1052 | 1052 |
1053 o 8:67e8f4a16c49 b 1053 o 8:67e8f4a16c49 b
1054 | 1054 |
1055 | o 7:1143e9adc121 f 1055 | * 7:1143e9adc121 f
1056 | | 1056 | |
1057 | | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5) 1057 | | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5)
1058 | | | 1058 | | |
1059 | | x 5:027ad6c5830d d' (rewritten using rebase as 10:44d8c724a70c) 1059 | | x 5:027ad6c5830d d' (rewritten using rebase as 10:44d8c724a70c)
1060 | | | 1060 | | |
1083 rebasing 4:76be324c128b "d" (d) 1083 rebasing 4:76be324c128b "d" (d)
1084 rebasing 7:1143e9adc121 "f" (f tip) 1084 rebasing 7:1143e9adc121 "f" (f tip)
1085 $ hg log -G -r 'a':: -T instabilities 1085 $ hg log -G -r 'a':: -T instabilities
1086 o 10:e1744ea07510 f 1086 o 10:e1744ea07510 f
1087 | 1087 |
1088 o 9:e2b36ea9a0a0 d (content-divergent) 1088 * 9:e2b36ea9a0a0 d (content-divergent)
1089 | 1089 |
1090 o 8:6a0376de376e c 1090 o 8:6a0376de376e c
1091 | 1091 |
1092 | x 7:1143e9adc121 f 1092 | x 7:1143e9adc121 f
1093 | | 1093 | |
1094 | | o 6:d60ebfa0f1cb e (orphan) 1094 | | * 6:d60ebfa0f1cb e (orphan)
1095 | | | 1095 | | |
1096 | | o 5:027ad6c5830d d' (orphan content-divergent) 1096 | | * 5:027ad6c5830d d' (orphan content-divergent)
1097 | | | 1097 | | |
1098 | x | 4:76be324c128b d 1098 | x | 4:76be324c128b d
1099 | |/ 1099 | |/
1100 | x 3:a82ac2b38757 c 1100 | x 3:a82ac2b38757 c
1101 | | 1101 | |
1130 > x b 1130 > x b
1131 > \| 1131 > \|
1132 > a 1132 > a
1133 > EOF 1133 > EOF
1134 $ hg log -G -r 'a': 1134 $ hg log -G -r 'a':
1135 o 8:2876ce66c6eb g 1135 * 8:2876ce66c6eb g
1136 | 1136 |
1137 | o 7:3ffec603ab53 f 1137 | o 7:3ffec603ab53 f
1138 | | 1138 | |
1139 x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea) 1139 x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
1140 | | 1140 | |
1166 |/ 1166 |/
1167 o 10:d008e6b4d3fd c 1167 o 10:d008e6b4d3fd c
1168 | 1168 |
1169 o 9:67e8f4a16c49 b 1169 o 9:67e8f4a16c49 b
1170 | 1170 |
1171 | o 8:2876ce66c6eb g 1171 | * 8:2876ce66c6eb g
1172 | | 1172 | |
1173 | | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616) 1173 | | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616)
1174 | | | 1174 | | |
1175 | x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea) 1175 | x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
1176 | | | 1176 | | |
1529 | 1529 |
1530 | x D1 1530 | x D1
1531 | | 1531 | |
1532 o | E 1532 o | E
1533 | | 1533 | |
1534 | o C 1534 | * C
1535 | | 1535 | |
1536 o | D2 1536 o | D2
1537 | | 1537 | |
1538 | x B 1538 | x B
1539 |/ 1539 |/