Mercurial > evolve

comparison tests/test-evolve-templates.t @ 4552:0eb80259f9cb mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Apr 2019 03:55:11 +0200
parents f54bb6eaf5e6
children 79bc0f1a832e
comparison
equal deleted inserted replaced
4551:7de160f6c7a9 4552:0eb80259f9cb
61 summary: ROOT 61 summary: ROOT
62 62
63 Check templates 63 Check templates
64 --------------- 64 ---------------
65 $ hg up 'desc(A0)' --hidden 65 $ hg up 'desc(A0)' --hidden
66 updating to a hidden changeset 471f378eab4c
67 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 working directory parent is obsolete! (471f378eab4c) 67 working directory parent is obsolete! (471f378eab4c)
70 (use 'hg evolve' to update to its successor: d004c8f274b9) 68 (use 'hg evolve' to update to its successor: d004c8f274b9)
71 69
72 Precursors template should show current revision as it is the working copy 70 Precursors template should show current revision as it is the working copy
154 |/ 152 |/
155 o "" 153 o ""
156 154
157 155
158 $ hg up 'desc(A1)' --hidden 156 $ hg up 'desc(A1)' --hidden
159 updating to a hidden changeset a468dc9b3633
160 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
162 working directory parent is obsolete! (a468dc9b3633) 158 working directory parent is obsolete! (a468dc9b3633)
163 (use 'hg evolve' to update to its successor: d004c8f274b9) 159 (use 'hg evolve' to update to its successor: d004c8f274b9)
164 160
165 Precursors template should show current revision as it is the working copy 161 Precursors template should show current revision as it is the working copy
330 326
331 Check templates 327 Check templates
332 --------------- 328 ---------------
333 329
334 $ hg up 'obsolete()' --hidden 330 $ hg up 'obsolete()' --hidden
335 updating to a hidden changeset 471597cad322
336 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 331 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 working directory parent is obsolete! (471597cad322) 332 working directory parent is obsolete! (471597cad322)
339 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 333 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
340 334
341 Precursors template should show current revision as it is the working copy 335 Precursors template should show current revision as it is the working copy
461 455
462 Check templates 456 Check templates
463 --------------- 457 ---------------
464 458
465 $ hg up 'desc(A0)' --hidden 459 $ hg up 'desc(A0)' --hidden
466 updating to a hidden changeset 471f378eab4c
467 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
468 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 460 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
469 working directory parent is obsolete! (471f378eab4c) 461 working directory parent is obsolete! (471f378eab4c)
470 (use 'hg evolve' to update to its successor: eb5a0daa2192) 462 (use 'hg evolve' to update to its successor: eb5a0daa2192)
471 463
472 Precursors template should show current revision as it is the working copy 464 Precursors template should show current revision as it is the working copy
488 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 480 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
489 | 481 |
490 o ea207398892e 482 o ea207398892e
491 483
492 $ hg up 'desc(B0)' --hidden 484 $ hg up 'desc(B0)' --hidden
493 updating to a hidden changeset 0dec01379d3b
494 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 485 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
496 working directory parent is obsolete! (0dec01379d3b) 486 working directory parent is obsolete! (0dec01379d3b)
497 (use 'hg evolve' to update to its successor: eb5a0daa2192) 487 (use 'hg evolve' to update to its successor: eb5a0daa2192)
498 488
499 Precursors template should show both precursors as they should be both 489 Precursors template should show both precursors as they should be both
595 user: test 585 user: test
596 date: Thu Jan 01 00:00:00 1970 +0000 586 date: Thu Jan 01 00:00:00 1970 +0000
597 summary: ROOT 587 summary: ROOT
598 588
599 $ hg update --hidden 'desc(A0)' 589 $ hg update --hidden 'desc(A0)'
600 updating to a hidden changeset 471f378eab4c
601 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
602 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 590 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
603 working directory parent is obsolete! (471f378eab4c) 591 working directory parent is obsolete! (471f378eab4c)
604 (use 'hg evolve' to update to its successor: fdf9bde5129a) 592 (use 'hg evolve' to update to its successor: fdf9bde5129a)
605 $ hg amend -m "A2" 593 $ hg amend -m "A2"
606 2 new content-divergent changesets
607 $ hg log --hidden -G 594 $ hg log --hidden -G
608 @ changeset: 3:65b757b745b9 595 @ changeset: 3:65b757b745b9
609 | tag: tip 596 | tag: tip
610 | parent: 0:ea207398892e 597 | parent: 0:ea207398892e
611 | user: test 598 | user: test
612 | date: Thu Jan 01 00:00:00 1970 +0000 599 | date: Thu Jan 01 00:00:00 1970 +0000
613 | instability: content-divergent 600 | instability: content-divergent
614 | summary: A2 601 | summary: A2
615 | 602 |
616 | * changeset: 2:fdf9bde5129a 603 | o changeset: 2:fdf9bde5129a
617 |/ parent: 0:ea207398892e 604 |/ parent: 0:ea207398892e
618 | user: test 605 | user: test
619 | date: Thu Jan 01 00:00:00 1970 +0000 606 | date: Thu Jan 01 00:00:00 1970 +0000
620 | instability: content-divergent 607 | instability: content-divergent
621 | summary: A1 608 | summary: A1
636 623
637 Check templates 624 Check templates
638 --------------- 625 ---------------
639 626
640 $ hg up 'desc(A0)' --hidden 627 $ hg up 'desc(A0)' --hidden
641 updating to a hidden changeset 471f378eab4c
642 (hidden revision '471f378eab4c' has diverged)
643 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 628 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 working directory parent is obsolete! (471f378eab4c) 629 working directory parent is obsolete! (471f378eab4c)
645 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 630 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
646 631
647 Precursors template should show current revision as it is the working copy 632 Precursors template should show current revision as it is the working copy
648 $ hg tlog 633 $ hg tlog
649 * 019fadeab383 634 o 019fadeab383
650 | Precursors: 1:471f378eab4c 635 | Precursors: 1:471f378eab4c
651 | semi-colon: 1:471f378eab4c 636 | semi-colon: 1:471f378eab4c
652 | * fdf9bde5129a 637 | o fdf9bde5129a
653 |/ Precursors: 1:471f378eab4c 638 |/ Precursors: 1:471f378eab4c
654 | semi-colon: 1:471f378eab4c 639 | semi-colon: 1:471f378eab4c
655 | @ 471f378eab4c 640 | @ 471f378eab4c
656 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 641 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
657 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 642 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
659 | Fate: reworded using amend as 4:019fadeab383 644 | Fate: reworded using amend as 4:019fadeab383
660 | 645 |
661 o ea207398892e 646 o ea207398892e
662 647
663 $ hg fatelog 648 $ hg fatelog
664 * 019fadeab383 649 o 019fadeab383
665 | 650 |
666 | * fdf9bde5129a 651 | o fdf9bde5129a
667 |/ 652 |/
668 | @ 471f378eab4c 653 | @ 471f378eab4c
669 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 654 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
670 | 655 |
671 o ea207398892e 656 o ea207398892e
674 $ hg up 'desc(A1)' 659 $ hg up 'desc(A1)'
675 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
676 Precursors template should not show precursors as it's not displayed in the 661 Precursors template should not show precursors as it's not displayed in the
677 log 662 log
678 $ hg tlog 663 $ hg tlog
679 * 019fadeab383 664 o 019fadeab383
680 | 665 |
681 | @ fdf9bde5129a 666 | @ fdf9bde5129a
682 |/ 667 |/
683 o ea207398892e 668 o ea207398892e
684 669
685 670
686 $ hg fatelog 671 $ hg fatelog
687 * 019fadeab383 672 o 019fadeab383
688 | 673 |
689 | @ fdf9bde5129a 674 | @ fdf9bde5129a
690 |/ 675 |/
691 o ea207398892e 676 o ea207398892e
692 677
693 Precursors template should a precursor as we force its display with --hidden 678 Precursors template should a precursor as we force its display with --hidden
694 $ hg tlog --hidden 679 $ hg tlog --hidden
695 * 019fadeab383 680 o 019fadeab383
696 | Precursors: 3:65b757b745b9 681 | Precursors: 3:65b757b745b9
697 | semi-colon: 3:65b757b745b9 682 | semi-colon: 3:65b757b745b9
698 | x 65b757b745b9 683 | x 65b757b745b9
699 |/ Precursors: 1:471f378eab4c 684 |/ Precursors: 1:471f378eab4c
700 | semi-colon: 1:471f378eab4c 685 | semi-colon: 1:471f378eab4c
712 | Fate: reworded using amend as 3:65b757b745b9 697 | Fate: reworded using amend as 3:65b757b745b9
713 | 698 |
714 o ea207398892e 699 o ea207398892e
715 700
716 $ hg fatelog --hidden 701 $ hg fatelog --hidden
717 * 019fadeab383 702 o 019fadeab383
718 | 703 |
719 | x 65b757b745b9 704 | x 65b757b745b9
720 |/ Obsfate: reworded using amend as 4:019fadeab383 705 |/ Obsfate: reworded using amend as 4:019fadeab383
721 | 706 |
722 | @ fdf9bde5129a 707 | @ fdf9bde5129a
800 785
801 Check templates 786 Check templates
802 --------------- 787 ---------------
803 788
804 $ hg up 'desc(A0)' --hidden 789 $ hg up 'desc(A0)' --hidden
805 updating to a hidden changeset 471f378eab4c
806 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
807 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 790 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
808 working directory parent is obsolete! (471f378eab4c) 791 working directory parent is obsolete! (471f378eab4c)
809 (use 'hg evolve' to update to its successor: eb5a0daa2192) 792 (use 'hg evolve' to update to its successor: eb5a0daa2192)
810 $ hg tlog 793 $ hg tlog
811 o eb5a0daa2192 794 o eb5a0daa2192
825 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 808 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
826 | 809 |
827 o ea207398892e 810 o ea207398892e
828 811
829 $ hg up 'desc(B0)' --hidden 812 $ hg up 'desc(B0)' --hidden
830 updating to a hidden changeset 0dec01379d3b
831 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
832 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 813 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
833 working directory parent is obsolete! (0dec01379d3b) 814 working directory parent is obsolete! (0dec01379d3b)
834 (use 'hg evolve' to update to its successor: eb5a0daa2192) 815 (use 'hg evolve' to update to its successor: eb5a0daa2192)
835 $ hg tlog 816 $ hg tlog
836 o eb5a0daa2192 817 o eb5a0daa2192
859 | 840 |
860 o ea207398892e 841 o ea207398892e
861 842
862 843
863 $ hg up 'desc(B1)' --hidden 844 $ hg up 'desc(B1)' --hidden
864 updating to a hidden changeset b7ea6d14e664
865 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
866 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 845 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
867 working directory parent is obsolete! (b7ea6d14e664) 846 working directory parent is obsolete! (b7ea6d14e664)
868 (use 'hg evolve' to update to its successor: eb5a0daa2192) 847 (use 'hg evolve' to update to its successor: eb5a0daa2192)
869 $ hg tlog 848 $ hg tlog
870 o eb5a0daa2192 849 o eb5a0daa2192
1099 1078
1100 Create the cycle 1079 Create the cycle
1101 1080
1102 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` 1081 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1103 obsoleted 1 changesets 1082 obsoleted 1 changesets
1104 1 new orphan changesets
1105 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` 1083 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1106 obsoleted 1 changesets 1084 obsoleted 1 changesets
1107 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` 1085 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1108 1086
1109 Check templates 1087 Check templates
1118 @ f897c6137566 1096 @ f897c6137566
1119 | 1097 |
1120 o ea207398892e 1098 o ea207398892e
1121 1099
1122 $ hg up -r "desc(B0)" --hidden 1100 $ hg up -r "desc(B0)" --hidden
1123 updating to a hidden changeset 0dec01379d3b
1124 (hidden revision '0dec01379d3b' is pruned)
1125 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1126 working directory parent is obsolete! (0dec01379d3b) 1102 working directory parent is obsolete! (0dec01379d3b)
1127 (use 'hg evolve' to update to its parent successor) 1103 (use 'hg evolve' to update to its parent successor)
1128 $ hg tlog 1104 $ hg tlog
1129 o f897c6137566 1105 o f897c6137566
1316 Diverge one of the split commit 1292 Diverge one of the split commit
1317 1293
1318 $ hg up 6 1294 $ hg up 6
1319 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1295 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1320 $ hg commit --amend -m "Add only B" 1296 $ hg commit --amend -m "Add only B"
1321 1 new orphan changesets
1322 1297
1323 $ hg up 6 --hidden 1298 $ hg up 6 --hidden
1324 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1299 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1325 working directory parent is obsolete! (4a004186e638) 1300 working directory parent is obsolete! (4a004186e638)
1326 (use 'hg evolve' to update to its successor: b18bc8331526) 1301 (use 'hg evolve' to update to its successor: b18bc8331526)
1327 $ hg commit --amend -m "Add B only" 1302 $ hg commit --amend -m "Add B only"
1328 4 new content-divergent changesets
1329 1303
1330 $ hg log -G 1304 $ hg log -G
1331 @ changeset: 9:0b997eb7ceee 1305 @ changeset: 9:0b997eb7ceee
1332 | tag: tip 1306 | tag: tip
1333 | parent: 5:dd800401bd8c 1307 | parent: 5:dd800401bd8c
1334 | user: test 1308 | user: test
1335 | date: Thu Jan 01 00:00:00 1970 +0000 1309 | date: Thu Jan 01 00:00:00 1970 +0000
1336 | instability: content-divergent 1310 | instability: content-divergent
1337 | summary: Add B only 1311 | summary: Add B only
1338 | 1312 |
1339 | * changeset: 8:b18bc8331526 1313 | o changeset: 8:b18bc8331526
1340 |/ parent: 5:dd800401bd8c 1314 |/ parent: 5:dd800401bd8c
1341 | user: test 1315 | user: test
1342 | date: Thu Jan 01 00:00:00 1970 +0000 1316 | date: Thu Jan 01 00:00:00 1970 +0000
1343 | instability: content-divergent 1317 | instability: content-divergent
1344 | summary: Add only B 1318 | summary: Add only B
1345 | 1319 |
1346 | * changeset: 7:ba2ed02b0c9a 1320 | o changeset: 7:ba2ed02b0c9a
1347 | | user: test 1321 | | user: test
1348 | | date: Thu Jan 01 00:00:00 1970 +0000 1322 | | date: Thu Jan 01 00:00:00 1970 +0000
1349 | | instability: orphan, content-divergent 1323 | | instability: orphan, content-divergent
1350 | | summary: Add A,B,C 1324 | | summary: Add A,B,C
1351 | | 1325 | |
1354 | date: Thu Jan 01 00:00:00 1970 +0000 1328 | date: Thu Jan 01 00:00:00 1970 +0000
1355 | obsolete: reworded using amend as 8:b18bc8331526 1329 | obsolete: reworded using amend as 8:b18bc8331526
1356 | obsolete: reworded using amend as 9:0b997eb7ceee 1330 | obsolete: reworded using amend as 9:0b997eb7ceee
1357 | summary: Add A,B,C 1331 | summary: Add A,B,C
1358 | 1332 |
1359 * changeset: 5:dd800401bd8c 1333 o changeset: 5:dd800401bd8c
1360 | parent: 3:f897c6137566 1334 | parent: 3:f897c6137566
1361 | user: test 1335 | user: test
1362 | date: Thu Jan 01 00:00:00 1970 +0000 1336 | date: Thu Jan 01 00:00:00 1970 +0000
1363 | instability: content-divergent 1337 | instability: content-divergent
1364 | summary: Add A,B,C 1338 | summary: Add A,B,C
1379 1353
1380 $ hg tlog 1354 $ hg tlog
1381 @ 0b997eb7ceee 1355 @ 0b997eb7ceee
1382 | Precursors: 6:4a004186e638 1356 | Precursors: 6:4a004186e638
1383 | semi-colon: 6:4a004186e638 1357 | semi-colon: 6:4a004186e638
1384 | * b18bc8331526 1358 | o b18bc8331526
1385 |/ Precursors: 6:4a004186e638 1359 |/ Precursors: 6:4a004186e638
1386 | semi-colon: 6:4a004186e638 1360 | semi-colon: 6:4a004186e638
1387 | * ba2ed02b0c9a 1361 | o ba2ed02b0c9a
1388 | | 1362 | |
1389 | x 4a004186e638 1363 | x 4a004186e638
1390 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee 1364 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1391 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1365 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1392 | Fate: reworded using amend as 8:b18bc8331526 1366 | Fate: reworded using amend as 8:b18bc8331526
1393 | Fate: reworded using amend as 9:0b997eb7ceee 1367 | Fate: reworded using amend as 9:0b997eb7ceee
1394 | 1368 |
1395 * dd800401bd8c 1369 o dd800401bd8c
1396 | 1370 |
1397 o f897c6137566 1371 o f897c6137566
1398 | 1372 |
1399 o ea207398892e 1373 o ea207398892e
1400 1374
1401 $ hg fatelog 1375 $ hg fatelog
1402 @ 0b997eb7ceee 1376 @ 0b997eb7ceee
1403 | 1377 |
1404 | * b18bc8331526 1378 | o b18bc8331526
1405 |/ 1379 |/
1406 | * ba2ed02b0c9a 1380 | o ba2ed02b0c9a
1407 | | 1381 | |
1408 | x 4a004186e638 1382 | x 4a004186e638
1409 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1383 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1410 | 1384 |
1411 * dd800401bd8c 1385 o dd800401bd8c
1412 | 1386 |
1413 o f897c6137566 1387 o f897c6137566
1414 | 1388 |
1415 o ea207398892e 1389 o ea207398892e
1416 1390
1417 $ hg tlog --hidden 1391 $ hg tlog --hidden
1418 @ 0b997eb7ceee 1392 @ 0b997eb7ceee
1419 | Precursors: 6:4a004186e638 1393 | Precursors: 6:4a004186e638
1420 | semi-colon: 6:4a004186e638 1394 | semi-colon: 6:4a004186e638
1421 | * b18bc8331526 1395 | o b18bc8331526
1422 |/ Precursors: 6:4a004186e638 1396 |/ Precursors: 6:4a004186e638
1423 | semi-colon: 6:4a004186e638 1397 | semi-colon: 6:4a004186e638
1424 | * ba2ed02b0c9a 1398 | o ba2ed02b0c9a
1425 | | Precursors: 4:9bd10a0775e4 1399 | | Precursors: 4:9bd10a0775e4
1426 | | semi-colon: 4:9bd10a0775e4 1400 | | semi-colon: 4:9bd10a0775e4
1427 | x 4a004186e638 1401 | x 4a004186e638
1428 |/ Precursors: 4:9bd10a0775e4 1402 |/ Precursors: 4:9bd10a0775e4
1429 | semi-colon: 4:9bd10a0775e4 1403 | semi-colon: 4:9bd10a0775e4
1430 | Successors: 8:b18bc8331526; 9:0b997eb7ceee 1404 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1431 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1405 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1432 | Fate: reworded using amend as 8:b18bc8331526 1406 | Fate: reworded using amend as 8:b18bc8331526
1433 | Fate: reworded using amend as 9:0b997eb7ceee 1407 | Fate: reworded using amend as 9:0b997eb7ceee
1434 | 1408 |
1435 * dd800401bd8c 1409 o dd800401bd8c
1436 | Precursors: 4:9bd10a0775e4 1410 | Precursors: 4:9bd10a0775e4
1437 | semi-colon: 4:9bd10a0775e4 1411 | semi-colon: 4:9bd10a0775e4
1438 | x 9bd10a0775e4 1412 | x 9bd10a0775e4
1439 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1413 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1440 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1414 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1461 o ea207398892e 1435 o ea207398892e
1462 1436
1463 $ hg fatelog --hidden 1437 $ hg fatelog --hidden
1464 @ 0b997eb7ceee 1438 @ 0b997eb7ceee
1465 | 1439 |
1466 | * b18bc8331526 1440 | o b18bc8331526
1467 |/ 1441 |/
1468 | * ba2ed02b0c9a 1442 | o ba2ed02b0c9a
1469 | | 1443 | |
1470 | x 4a004186e638 1444 | x 4a004186e638
1471 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1445 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1472 | 1446 |
1473 * dd800401bd8c 1447 o dd800401bd8c
1474 | 1448 |
1475 | x 9bd10a0775e4 1449 | x 9bd10a0775e4
1476 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a 1450 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
1477 | 1451 |
1478 o f897c6137566 1452 o f897c6137566
1484 |/ Obsfate: rewritten as 2:0dec01379d3b 1458 |/ Obsfate: rewritten as 2:0dec01379d3b
1485 | 1459 |
1486 o ea207398892e 1460 o ea207398892e
1487 1461
1488 $ hg up --hidden 4 1462 $ hg up --hidden 4
1489 updating to a hidden changeset 9bd10a0775e4
1490 (hidden revision '9bd10a0775e4' has diverged)
1491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1463 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1492 working directory parent is obsolete! (9bd10a0775e4) 1464 working directory parent is obsolete! (9bd10a0775e4)
1493 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1465 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1494 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1466 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1495 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1467 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1496 $ hg tlog 1468 $ hg tlog
1497 * eceed8f98ffc 1469 o eceed8f98ffc
1498 | Precursors: 4:9bd10a0775e4 1470 | Precursors: 4:9bd10a0775e4
1499 | semi-colon: 4:9bd10a0775e4 1471 | semi-colon: 4:9bd10a0775e4
1500 | * 0b997eb7ceee 1472 | o 0b997eb7ceee
1501 | | Precursors: 4:9bd10a0775e4 1473 | | Precursors: 4:9bd10a0775e4
1502 | | semi-colon: 4:9bd10a0775e4 1474 | | semi-colon: 4:9bd10a0775e4
1503 * | b18bc8331526 1475 o | b18bc8331526
1504 |/ Precursors: 4:9bd10a0775e4 1476 |/ Precursors: 4:9bd10a0775e4
1505 | semi-colon: 4:9bd10a0775e4 1477 | semi-colon: 4:9bd10a0775e4
1506 * dd800401bd8c 1478 o dd800401bd8c
1507 | Precursors: 4:9bd10a0775e4 1479 | Precursors: 4:9bd10a0775e4
1508 | semi-colon: 4:9bd10a0775e4 1480 | semi-colon: 4:9bd10a0775e4
1509 | @ 9bd10a0775e4 1481 | @ 9bd10a0775e4
1510 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1482 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1511 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1483 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1515 o f897c6137566 1487 o f897c6137566
1516 | 1488 |
1517 o ea207398892e 1489 o ea207398892e
1518 1490
1519 $ hg fatelog 1491 $ hg fatelog
1520 * eceed8f98ffc 1492 o eceed8f98ffc
1521 | 1493 |
1522 | * 0b997eb7ceee 1494 | o 0b997eb7ceee
1523 | | 1495 | |
1524 * | b18bc8331526 1496 o | b18bc8331526
1525 |/ 1497 |/
1526 * dd800401bd8c 1498 o dd800401bd8c
1527 | 1499 |
1528 | @ 9bd10a0775e4 1500 | @ 9bd10a0775e4
1529 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc 1501 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
1530 | 1502 |
1531 o f897c6137566 1503 o f897c6137566
1549 1521
1550 Check output 1522 Check output
1551 ------------ 1523 ------------
1552 1524
1553 $ hg up "desc(A0)" --hidden 1525 $ hg up "desc(A0)" --hidden
1554 updating to a hidden changeset 471f378eab4c
1555 (hidden revision '471f378eab4c' is pruned)
1556 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1526 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1557 working directory parent is obsolete! (471f378eab4c) 1527 working directory parent is obsolete! (471f378eab4c)
1558 (use 'hg evolve' to update to its parent successor) 1528 (use 'hg evolve' to update to its parent successor)
1559 $ hg tlog 1529 $ hg tlog
1560 @ 471f378eab4c 1530 @ 471f378eab4c