Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3590:d5adce52cef4 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:06:17 +0100
parents 5ddea3b8d2a4
children 98941c28f3e2 19ec729f3ca2
comparison
equal deleted inserted replaced
3589:e4ac2e2c2086 3590:d5adce52cef4
62 summary: ROOT 62 summary: ROOT
63 63
64 Check templates 64 Check templates
65 --------------- 65 ---------------
66 $ hg up 'desc(A0)' --hidden 66 $ hg up 'desc(A0)' --hidden
67 updating to a hidden changeset 471f378eab4c
68 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
70 working directory parent is obsolete! (471f378eab4c) 68 working directory parent is obsolete! (471f378eab4c)
71 (use 'hg evolve' to update to its successor: d004c8f274b9) 69 (use 'hg evolve' to update to its successor: d004c8f274b9)
72 70
73 Precursors template should show current revision as it is the working copy 71 Precursors template should show current revision as it is the working copy
155 |/ 153 |/
156 o "" 154 o ""
157 155
158 156
159 $ hg up 'desc(A1)' --hidden 157 $ hg up 'desc(A1)' --hidden
160 updating to a hidden changeset a468dc9b3633
161 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
163 working directory parent is obsolete! (a468dc9b3633) 159 working directory parent is obsolete! (a468dc9b3633)
164 (use 'hg evolve' to update to its successor: d004c8f274b9) 160 (use 'hg evolve' to update to its successor: d004c8f274b9)
165 161
166 Precursors template should show current revision as it is the working copy 162 Precursors template should show current revision as it is the working copy
341 337
342 Check templates 338 Check templates
343 --------------- 339 ---------------
344 340
345 $ hg up 'obsolete()' --hidden 341 $ hg up 'obsolete()' --hidden
346 updating to a hidden changeset 471597cad322
347 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
348 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 342 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
349 working directory parent is obsolete! (471597cad322) 343 working directory parent is obsolete! (471597cad322)
350 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 344 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
351 345
352 Precursors template should show current revision as it is the working copy 346 Precursors template should show current revision as it is the working copy
482 476
483 Check templates 477 Check templates
484 --------------- 478 ---------------
485 479
486 $ hg up 'desc(A0)' --hidden 480 $ hg up 'desc(A0)' --hidden
487 updating to a hidden changeset 471f378eab4c
488 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
489 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 481 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
490 working directory parent is obsolete! (471f378eab4c) 482 working directory parent is obsolete! (471f378eab4c)
491 (use 'hg evolve' to update to its successor: eb5a0daa2192) 483 (use 'hg evolve' to update to its successor: eb5a0daa2192)
492 484
493 Precursors template should show current revision as it is the working copy 485 Precursors template should show current revision as it is the working copy
509 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 501 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
510 | 502 |
511 o ea207398892e 503 o ea207398892e
512 504
513 $ hg up 'desc(B0)' --hidden 505 $ hg up 'desc(B0)' --hidden
514 updating to a hidden changeset 0dec01379d3b
515 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
516 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
517 working directory parent is obsolete! (0dec01379d3b) 507 working directory parent is obsolete! (0dec01379d3b)
518 (use 'hg evolve' to update to its successor: eb5a0daa2192) 508 (use 'hg evolve' to update to its successor: eb5a0daa2192)
519 509
520 Precursors template should show both precursors as they should be both 510 Precursors template should show both precursors as they should be both
626 user: test 616 user: test
627 date: Thu Jan 01 00:00:00 1970 +0000 617 date: Thu Jan 01 00:00:00 1970 +0000
628 summary: ROOT 618 summary: ROOT
629 619
630 $ hg update --hidden 'desc(A0)' 620 $ hg update --hidden 'desc(A0)'
631 updating to a hidden changeset 471f378eab4c
632 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
633 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 621 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
634 working directory parent is obsolete! (471f378eab4c) 622 working directory parent is obsolete! (471f378eab4c)
635 (use 'hg evolve' to update to its successor: fdf9bde5129a) 623 (use 'hg evolve' to update to its successor: fdf9bde5129a)
636 $ hg amend -m "A2" 624 $ hg amend -m "A2"
637 2 new content-divergent changesets 625 2 new content-divergent changesets
642 | user: test 630 | user: test
643 | date: Thu Jan 01 00:00:00 1970 +0000 631 | date: Thu Jan 01 00:00:00 1970 +0000
644 | instability: content-divergent 632 | instability: content-divergent
645 | summary: A2 633 | summary: A2
646 | 634 |
647 | * changeset: 2:fdf9bde5129a 635 | o changeset: 2:fdf9bde5129a
648 |/ parent: 0:ea207398892e 636 |/ parent: 0:ea207398892e
649 | user: test 637 | user: test
650 | date: Thu Jan 01 00:00:00 1970 +0000 638 | date: Thu Jan 01 00:00:00 1970 +0000
651 | instability: content-divergent 639 | instability: content-divergent
652 | summary: A1 640 | summary: A1
667 655
668 Check templates 656 Check templates
669 --------------- 657 ---------------
670 658
671 $ hg up 'desc(A0)' --hidden 659 $ hg up 'desc(A0)' --hidden
672 updating to a hidden changeset 471f378eab4c
673 (hidden revision '471f378eab4c' has diverged)
674 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 660 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
675 working directory parent is obsolete! (471f378eab4c) 661 working directory parent is obsolete! (471f378eab4c)
676 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 662 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
677 663
678 Precursors template should show current revision as it is the working copy 664 Precursors template should show current revision as it is the working copy
679 $ hg tlog 665 $ hg tlog
680 * 019fadeab383 666 o 019fadeab383
681 | Precursors: 1:471f378eab4c 667 | Precursors: 1:471f378eab4c
682 | semi-colon: 1:471f378eab4c 668 | semi-colon: 1:471f378eab4c
683 | * fdf9bde5129a 669 | o fdf9bde5129a
684 |/ Precursors: 1:471f378eab4c 670 |/ Precursors: 1:471f378eab4c
685 | semi-colon: 1:471f378eab4c 671 | semi-colon: 1:471f378eab4c
686 | @ 471f378eab4c 672 | @ 471f378eab4c
687 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
688 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
690 | Fate: reworded using amend as 4:019fadeab383 676 | Fate: reworded using amend as 4:019fadeab383
691 | 677 |
692 o ea207398892e 678 o ea207398892e
693 679
694 $ hg fatelog 680 $ hg fatelog
695 * 019fadeab383 681 o 019fadeab383
696 | 682 |
697 | * fdf9bde5129a 683 | o fdf9bde5129a
698 |/ 684 |/
699 | @ 471f378eab4c 685 | @ 471f378eab4c
700 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 686 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
701 | 687 |
702 o ea207398892e 688 o ea207398892e
705 $ hg up 'desc(A1)' 691 $ hg up 'desc(A1)'
706 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 692 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
707 Precursors template should not show precursors as it's not displayed in the 693 Precursors template should not show precursors as it's not displayed in the
708 log 694 log
709 $ hg tlog 695 $ hg tlog
710 * 019fadeab383 696 o 019fadeab383
711 | 697 |
712 | @ fdf9bde5129a 698 | @ fdf9bde5129a
713 |/ 699 |/
714 o ea207398892e 700 o ea207398892e
715 701
716 702
717 $ hg fatelog 703 $ hg fatelog
718 * 019fadeab383 704 o 019fadeab383
719 | 705 |
720 | @ fdf9bde5129a 706 | @ fdf9bde5129a
721 |/ 707 |/
722 o ea207398892e 708 o ea207398892e
723 709
724 Precursors template should a precursor as we force its display with --hidden 710 Precursors template should a precursor as we force its display with --hidden
725 $ hg tlog --hidden 711 $ hg tlog --hidden
726 * 019fadeab383 712 o 019fadeab383
727 | Precursors: 3:65b757b745b9 713 | Precursors: 3:65b757b745b9
728 | semi-colon: 3:65b757b745b9 714 | semi-colon: 3:65b757b745b9
729 | x 65b757b745b9 715 | x 65b757b745b9
730 |/ Precursors: 1:471f378eab4c 716 |/ Precursors: 1:471f378eab4c
731 | semi-colon: 1:471f378eab4c 717 | semi-colon: 1:471f378eab4c
743 | Fate: reworded using amend as 3:65b757b745b9 729 | Fate: reworded using amend as 3:65b757b745b9
744 | 730 |
745 o ea207398892e 731 o ea207398892e
746 732
747 $ hg fatelog --hidden 733 $ hg fatelog --hidden
748 * 019fadeab383 734 o 019fadeab383
749 | 735 |
750 | x 65b757b745b9 736 | x 65b757b745b9
751 |/ Obsfate: reworded using amend as 4:019fadeab383 737 |/ Obsfate: reworded using amend as 4:019fadeab383
752 | 738 |
753 | @ fdf9bde5129a 739 | @ fdf9bde5129a
757 | 743 |
758 o ea207398892e 744 o ea207398892e
759 745
760 746
761 $ hg fatelogjson --hidden 747 $ hg fatelogjson --hidden
762 * 019fadeab383 [] 748 o 019fadeab383 []
763 | 749 |
764 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] 750 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
765 |/ 751 |/
766 | @ fdf9bde5129a [] 752 | @ fdf9bde5129a []
767 |/ 753 |/
843 829
844 Check templates 830 Check templates
845 --------------- 831 ---------------
846 832
847 $ hg up 'desc(A0)' --hidden 833 $ hg up 'desc(A0)' --hidden
848 updating to a hidden changeset 471f378eab4c
849 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
850 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 834 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
851 working directory parent is obsolete! (471f378eab4c) 835 working directory parent is obsolete! (471f378eab4c)
852 (use 'hg evolve' to update to its successor: eb5a0daa2192) 836 (use 'hg evolve' to update to its successor: eb5a0daa2192)
853 $ hg tlog 837 $ hg tlog
854 o eb5a0daa2192 838 o eb5a0daa2192
868 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 852 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
869 | 853 |
870 o ea207398892e 854 o ea207398892e
871 855
872 $ hg up 'desc(B0)' --hidden 856 $ hg up 'desc(B0)' --hidden
873 updating to a hidden changeset 0dec01379d3b
874 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
875 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
876 working directory parent is obsolete! (0dec01379d3b) 858 working directory parent is obsolete! (0dec01379d3b)
877 (use 'hg evolve' to update to its successor: eb5a0daa2192) 859 (use 'hg evolve' to update to its successor: eb5a0daa2192)
878 $ hg tlog 860 $ hg tlog
879 o eb5a0daa2192 861 o eb5a0daa2192
902 | 884 |
903 o ea207398892e 885 o ea207398892e
904 886
905 887
906 $ hg up 'desc(B1)' --hidden 888 $ hg up 'desc(B1)' --hidden
907 updating to a hidden changeset b7ea6d14e664
908 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
909 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 889 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
910 working directory parent is obsolete! (b7ea6d14e664) 890 working directory parent is obsolete! (b7ea6d14e664)
911 (use 'hg evolve' to update to its successor: eb5a0daa2192) 891 (use 'hg evolve' to update to its successor: eb5a0daa2192)
912 $ hg tlog 892 $ hg tlog
913 o eb5a0daa2192 893 o eb5a0daa2192
1161 1141
1162 Create the cycle 1142 Create the cycle
1163 1143
1164 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` 1144 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1165 obsoleted 1 changesets 1145 obsoleted 1 changesets
1166 1 new orphan changesets
1167 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` 1146 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1168 obsoleted 1 changesets 1147 obsoleted 1 changesets
1169 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` 1148 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1170 1149
1171 Check templates 1150 Check templates
1180 @ f897c6137566 1159 @ f897c6137566
1181 | 1160 |
1182 o ea207398892e 1161 o ea207398892e
1183 1162
1184 $ hg up -r "desc(B0)" --hidden 1163 $ hg up -r "desc(B0)" --hidden
1185 updating to a hidden changeset 0dec01379d3b
1186 (hidden revision '0dec01379d3b' is pruned)
1187 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1164 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1188 working directory parent is obsolete! (0dec01379d3b) 1165 working directory parent is obsolete! (0dec01379d3b)
1189 (use 'hg evolve' to update to its parent successor) 1166 (use 'hg evolve' to update to its parent successor)
1190 $ hg tlog 1167 $ hg tlog
1191 o f897c6137566 1168 o f897c6137566
1396 | user: test 1373 | user: test
1397 | date: Thu Jan 01 00:00:00 1970 +0000 1374 | date: Thu Jan 01 00:00:00 1970 +0000
1398 | instability: content-divergent 1375 | instability: content-divergent
1399 | summary: Add B only 1376 | summary: Add B only
1400 | 1377 |
1401 | * changeset: 8:b18bc8331526 1378 | o changeset: 8:b18bc8331526
1402 |/ parent: 5:dd800401bd8c 1379 |/ parent: 5:dd800401bd8c
1403 | user: test 1380 | user: test
1404 | date: Thu Jan 01 00:00:00 1970 +0000 1381 | date: Thu Jan 01 00:00:00 1970 +0000
1405 | instability: content-divergent 1382 | instability: content-divergent
1406 | summary: Add only B 1383 | summary: Add only B
1407 | 1384 |
1408 | * changeset: 7:ba2ed02b0c9a 1385 | o changeset: 7:ba2ed02b0c9a
1409 | | user: test 1386 | | user: test
1410 | | date: Thu Jan 01 00:00:00 1970 +0000 1387 | | date: Thu Jan 01 00:00:00 1970 +0000
1411 | | instability: orphan, content-divergent 1388 | | instability: orphan, content-divergent
1412 | | summary: Add A,B,C 1389 | | summary: Add A,B,C
1413 | | 1390 | |
1416 | date: Thu Jan 01 00:00:00 1970 +0000 1393 | date: Thu Jan 01 00:00:00 1970 +0000
1417 | obsolete: reworded using amend as 8:b18bc8331526 1394 | obsolete: reworded using amend as 8:b18bc8331526
1418 | obsolete: reworded using amend as 9:0b997eb7ceee 1395 | obsolete: reworded using amend as 9:0b997eb7ceee
1419 | summary: Add A,B,C 1396 | summary: Add A,B,C
1420 | 1397 |
1421 * changeset: 5:dd800401bd8c 1398 o changeset: 5:dd800401bd8c
1422 | parent: 3:f897c6137566 1399 | parent: 3:f897c6137566
1423 | user: test 1400 | user: test
1424 | date: Thu Jan 01 00:00:00 1970 +0000 1401 | date: Thu Jan 01 00:00:00 1970 +0000
1425 | instability: content-divergent 1402 | instability: content-divergent
1426 | summary: Add A,B,C 1403 | summary: Add A,B,C
1441 1418
1442 $ hg tlog 1419 $ hg tlog
1443 @ 0b997eb7ceee 1420 @ 0b997eb7ceee
1444 | Precursors: 6:4a004186e638 1421 | Precursors: 6:4a004186e638
1445 | semi-colon: 6:4a004186e638 1422 | semi-colon: 6:4a004186e638
1446 | * b18bc8331526 1423 | o b18bc8331526
1447 |/ Precursors: 6:4a004186e638 1424 |/ Precursors: 6:4a004186e638
1448 | semi-colon: 6:4a004186e638 1425 | semi-colon: 6:4a004186e638
1449 | * ba2ed02b0c9a 1426 | o ba2ed02b0c9a
1450 | | 1427 | |
1451 | x 4a004186e638 1428 | x 4a004186e638
1452 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee 1429 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1453 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1430 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1454 | Fate: reworded using amend as 8:b18bc8331526 1431 | Fate: reworded using amend as 8:b18bc8331526
1455 | Fate: reworded using amend as 9:0b997eb7ceee 1432 | Fate: reworded using amend as 9:0b997eb7ceee
1456 | 1433 |
1457 * dd800401bd8c 1434 o dd800401bd8c
1458 | 1435 |
1459 o f897c6137566 1436 o f897c6137566
1460 | 1437 |
1461 o ea207398892e 1438 o ea207398892e
1462 1439
1463 $ hg fatelog 1440 $ hg fatelog
1464 @ 0b997eb7ceee 1441 @ 0b997eb7ceee
1465 | 1442 |
1466 | * b18bc8331526 1443 | o b18bc8331526
1467 |/ 1444 |/
1468 | * ba2ed02b0c9a 1445 | o ba2ed02b0c9a
1469 | | 1446 | |
1470 | x 4a004186e638 1447 | x 4a004186e638
1471 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1448 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1472 | 1449 |
1473 * dd800401bd8c 1450 o dd800401bd8c
1474 | 1451 |
1475 o f897c6137566 1452 o f897c6137566
1476 | 1453 |
1477 o ea207398892e 1454 o ea207398892e
1478 1455
1479 $ hg tlog --hidden 1456 $ hg tlog --hidden
1480 @ 0b997eb7ceee 1457 @ 0b997eb7ceee
1481 | Precursors: 6:4a004186e638 1458 | Precursors: 6:4a004186e638
1482 | semi-colon: 6:4a004186e638 1459 | semi-colon: 6:4a004186e638
1483 | * b18bc8331526 1460 | o b18bc8331526
1484 |/ Precursors: 6:4a004186e638 1461 |/ Precursors: 6:4a004186e638
1485 | semi-colon: 6:4a004186e638 1462 | semi-colon: 6:4a004186e638
1486 | * ba2ed02b0c9a 1463 | o ba2ed02b0c9a
1487 | | Precursors: 4:9bd10a0775e4 1464 | | Precursors: 4:9bd10a0775e4
1488 | | semi-colon: 4:9bd10a0775e4 1465 | | semi-colon: 4:9bd10a0775e4
1489 | x 4a004186e638 1466 | x 4a004186e638
1490 |/ Precursors: 4:9bd10a0775e4 1467 |/ Precursors: 4:9bd10a0775e4
1491 | semi-colon: 4:9bd10a0775e4 1468 | semi-colon: 4:9bd10a0775e4
1492 | Successors: 8:b18bc8331526; 9:0b997eb7ceee 1469 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1493 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1470 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1494 | Fate: reworded using amend as 8:b18bc8331526 1471 | Fate: reworded using amend as 8:b18bc8331526
1495 | Fate: reworded using amend as 9:0b997eb7ceee 1472 | Fate: reworded using amend as 9:0b997eb7ceee
1496 | 1473 |
1497 * dd800401bd8c 1474 o dd800401bd8c
1498 | Precursors: 4:9bd10a0775e4 1475 | Precursors: 4:9bd10a0775e4
1499 | semi-colon: 4:9bd10a0775e4 1476 | semi-colon: 4:9bd10a0775e4
1500 | x 9bd10a0775e4 1477 | x 9bd10a0775e4
1501 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1478 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1502 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1479 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1523 o ea207398892e 1500 o ea207398892e
1524 1501
1525 $ hg fatelog --hidden 1502 $ hg fatelog --hidden
1526 @ 0b997eb7ceee 1503 @ 0b997eb7ceee
1527 | 1504 |
1528 | * b18bc8331526 1505 | o b18bc8331526
1529 |/ 1506 |/
1530 | * ba2ed02b0c9a 1507 | o ba2ed02b0c9a
1531 | | 1508 | |
1532 | x 4a004186e638 1509 | x 4a004186e638
1533 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1510 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1534 | 1511 |
1535 * dd800401bd8c 1512 o dd800401bd8c
1536 | 1513 |
1537 | x 9bd10a0775e4 1514 | x 9bd10a0775e4
1538 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a 1515 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
1539 | 1516 |
1540 o f897c6137566 1517 o f897c6137566
1546 |/ Obsfate: rewritten as 2:0dec01379d3b 1523 |/ Obsfate: rewritten as 2:0dec01379d3b
1547 | 1524 |
1548 o ea207398892e 1525 o ea207398892e
1549 1526
1550 $ hg up --hidden 4 1527 $ hg up --hidden 4
1551 updating to a hidden changeset 9bd10a0775e4
1552 (hidden revision '9bd10a0775e4' has diverged)
1553 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1554 working directory parent is obsolete! (9bd10a0775e4) 1529 working directory parent is obsolete! (9bd10a0775e4)
1555 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1530 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1556 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1531 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1557 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1532 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1558 $ hg tlog 1533 $ hg tlog
1559 * eceed8f98ffc 1534 o eceed8f98ffc
1560 | Precursors: 4:9bd10a0775e4 1535 | Precursors: 4:9bd10a0775e4
1561 | semi-colon: 4:9bd10a0775e4 1536 | semi-colon: 4:9bd10a0775e4
1562 | * 0b997eb7ceee 1537 | o 0b997eb7ceee
1563 | | Precursors: 4:9bd10a0775e4 1538 | | Precursors: 4:9bd10a0775e4
1564 | | semi-colon: 4:9bd10a0775e4 1539 | | semi-colon: 4:9bd10a0775e4
1565 * | b18bc8331526 1540 o | b18bc8331526
1566 |/ Precursors: 4:9bd10a0775e4 1541 |/ Precursors: 4:9bd10a0775e4
1567 | semi-colon: 4:9bd10a0775e4 1542 | semi-colon: 4:9bd10a0775e4
1568 * dd800401bd8c 1543 o dd800401bd8c
1569 | Precursors: 4:9bd10a0775e4 1544 | Precursors: 4:9bd10a0775e4
1570 | semi-colon: 4:9bd10a0775e4 1545 | semi-colon: 4:9bd10a0775e4
1571 | @ 9bd10a0775e4 1546 | @ 9bd10a0775e4
1572 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1547 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1573 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1548 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1577 o f897c6137566 1552 o f897c6137566
1578 | 1553 |
1579 o ea207398892e 1554 o ea207398892e
1580 1555
1581 $ hg fatelog 1556 $ hg fatelog
1582 * eceed8f98ffc 1557 o eceed8f98ffc
1583 | 1558 |
1584 | * 0b997eb7ceee 1559 | o 0b997eb7ceee
1585 | | 1560 | |
1586 * | b18bc8331526 1561 o | b18bc8331526
1587 |/ 1562 |/
1588 * dd800401bd8c 1563 o dd800401bd8c
1589 | 1564 |
1590 | @ 9bd10a0775e4 1565 | @ 9bd10a0775e4
1591 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc 1566 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
1592 | 1567 |
1593 o f897c6137566 1568 o f897c6137566
1611 1586
1612 Check output 1587 Check output
1613 ------------ 1588 ------------
1614 1589
1615 $ hg up "desc(A0)" --hidden 1590 $ hg up "desc(A0)" --hidden
1616 updating to a hidden changeset 471f378eab4c
1617 (hidden revision '471f378eab4c' is pruned)
1618 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1619 working directory parent is obsolete! (471f378eab4c) 1592 working directory parent is obsolete! (471f378eab4c)
1620 (use 'hg evolve' to update to its parent successor) 1593 (use 'hg evolve' to update to its parent successor)
1621 $ hg tlog 1594 $ hg tlog
1622 @ 471f378eab4c 1595 @ 471f378eab4c