Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3930:d00f0c369bc7 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 Thu, 02 Aug 2018 02:47:44 +0200
parents 19ec729f3ca2 f7afd3a158e3
children 537fd9a86c06 e268f7fd7839
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
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 594 2 new content-divergent changesets
611 | user: test 599 | user: test
612 | date: Thu Jan 01 00:00:00 1970 +0000 600 | date: Thu Jan 01 00:00:00 1970 +0000
613 | instability: content-divergent 601 | instability: content-divergent
614 | summary: A2 602 | summary: A2
615 | 603 |
616 | * changeset: 2:fdf9bde5129a 604 | o changeset: 2:fdf9bde5129a
617 |/ parent: 0:ea207398892e 605 |/ parent: 0:ea207398892e
618 | user: test 606 | user: test
619 | date: Thu Jan 01 00:00:00 1970 +0000 607 | date: Thu Jan 01 00:00:00 1970 +0000
620 | instability: content-divergent 608 | instability: content-divergent
621 | summary: A1 609 | summary: A1
636 624
637 Check templates 625 Check templates
638 --------------- 626 ---------------
639 627
640 $ hg up 'desc(A0)' --hidden 628 $ 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 629 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 working directory parent is obsolete! (471f378eab4c) 630 working directory parent is obsolete! (471f378eab4c)
645 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 631 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
646 632
647 Precursors template should show current revision as it is the working copy 633 Precursors template should show current revision as it is the working copy
648 $ hg tlog 634 $ hg tlog
649 * 019fadeab383 635 o 019fadeab383
650 | Precursors: 1:471f378eab4c 636 | Precursors: 1:471f378eab4c
651 | semi-colon: 1:471f378eab4c 637 | semi-colon: 1:471f378eab4c
652 | * fdf9bde5129a 638 | o fdf9bde5129a
653 |/ Precursors: 1:471f378eab4c 639 |/ Precursors: 1:471f378eab4c
654 | semi-colon: 1:471f378eab4c 640 | semi-colon: 1:471f378eab4c
655 | @ 471f378eab4c 641 | @ 471f378eab4c
656 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 642 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
657 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 643 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
659 | Fate: reworded using amend as 4:019fadeab383 645 | Fate: reworded using amend as 4:019fadeab383
660 | 646 |
661 o ea207398892e 647 o ea207398892e
662 648
663 $ hg fatelog 649 $ hg fatelog
664 * 019fadeab383 650 o 019fadeab383
665 | 651 |
666 | * fdf9bde5129a 652 | o fdf9bde5129a
667 |/ 653 |/
668 | @ 471f378eab4c 654 | @ 471f378eab4c
669 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 655 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
670 | 656 |
671 o ea207398892e 657 o ea207398892e
674 $ hg up 'desc(A1)' 660 $ hg up 'desc(A1)'
675 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 661 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 662 Precursors template should not show precursors as it's not displayed in the
677 log 663 log
678 $ hg tlog 664 $ hg tlog
679 * 019fadeab383 665 o 019fadeab383
680 | 666 |
681 | @ fdf9bde5129a 667 | @ fdf9bde5129a
682 |/ 668 |/
683 o ea207398892e 669 o ea207398892e
684 670
685 671
686 $ hg fatelog 672 $ hg fatelog
687 * 019fadeab383 673 o 019fadeab383
688 | 674 |
689 | @ fdf9bde5129a 675 | @ fdf9bde5129a
690 |/ 676 |/
691 o ea207398892e 677 o ea207398892e
692 678
693 Precursors template should a precursor as we force its display with --hidden 679 Precursors template should a precursor as we force its display with --hidden
694 $ hg tlog --hidden 680 $ hg tlog --hidden
695 * 019fadeab383 681 o 019fadeab383
696 | Precursors: 3:65b757b745b9 682 | Precursors: 3:65b757b745b9
697 | semi-colon: 3:65b757b745b9 683 | semi-colon: 3:65b757b745b9
698 | x 65b757b745b9 684 | x 65b757b745b9
699 |/ Precursors: 1:471f378eab4c 685 |/ Precursors: 1:471f378eab4c
700 | semi-colon: 1:471f378eab4c 686 | semi-colon: 1:471f378eab4c
712 | Fate: reworded using amend as 3:65b757b745b9 698 | Fate: reworded using amend as 3:65b757b745b9
713 | 699 |
714 o ea207398892e 700 o ea207398892e
715 701
716 $ hg fatelog --hidden 702 $ hg fatelog --hidden
717 * 019fadeab383 703 o 019fadeab383
718 | 704 |
719 | x 65b757b745b9 705 | x 65b757b745b9
720 |/ Obsfate: reworded using amend as 4:019fadeab383 706 |/ Obsfate: reworded using amend as 4:019fadeab383
721 | 707 |
722 | @ fdf9bde5129a 708 | @ fdf9bde5129a
800 786
801 Check templates 787 Check templates
802 --------------- 788 ---------------
803 789
804 $ hg up 'desc(A0)' --hidden 790 $ 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 791 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
808 working directory parent is obsolete! (471f378eab4c) 792 working directory parent is obsolete! (471f378eab4c)
809 (use 'hg evolve' to update to its successor: eb5a0daa2192) 793 (use 'hg evolve' to update to its successor: eb5a0daa2192)
810 $ hg tlog 794 $ hg tlog
811 o eb5a0daa2192 795 o eb5a0daa2192
825 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 809 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
826 | 810 |
827 o ea207398892e 811 o ea207398892e
828 812
829 $ hg up 'desc(B0)' --hidden 813 $ 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 814 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
833 working directory parent is obsolete! (0dec01379d3b) 815 working directory parent is obsolete! (0dec01379d3b)
834 (use 'hg evolve' to update to its successor: eb5a0daa2192) 816 (use 'hg evolve' to update to its successor: eb5a0daa2192)
835 $ hg tlog 817 $ hg tlog
836 o eb5a0daa2192 818 o eb5a0daa2192
859 | 841 |
860 o ea207398892e 842 o ea207398892e
861 843
862 844
863 $ hg up 'desc(B1)' --hidden 845 $ 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 846 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
867 working directory parent is obsolete! (b7ea6d14e664) 847 working directory parent is obsolete! (b7ea6d14e664)
868 (use 'hg evolve' to update to its successor: eb5a0daa2192) 848 (use 'hg evolve' to update to its successor: eb5a0daa2192)
869 $ hg tlog 849 $ hg tlog
870 o eb5a0daa2192 850 o eb5a0daa2192
1099 1079
1100 Create the cycle 1080 Create the cycle
1101 1081
1102 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` 1082 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1103 obsoleted 1 changesets 1083 obsoleted 1 changesets
1104 1 new orphan changesets
1105 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` 1084 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1106 obsoleted 1 changesets 1085 obsoleted 1 changesets
1107 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` 1086 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1108 1087
1109 Check templates 1088 Check templates
1118 @ f897c6137566 1097 @ f897c6137566
1119 | 1098 |
1120 o ea207398892e 1099 o ea207398892e
1121 1100
1122 $ hg up -r "desc(B0)" --hidden 1101 $ 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 1102 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1126 working directory parent is obsolete! (0dec01379d3b) 1103 working directory parent is obsolete! (0dec01379d3b)
1127 (use 'hg evolve' to update to its parent successor) 1104 (use 'hg evolve' to update to its parent successor)
1128 $ hg tlog 1105 $ hg tlog
1129 o f897c6137566 1106 o f897c6137566
1334 | user: test 1311 | user: test
1335 | date: Thu Jan 01 00:00:00 1970 +0000 1312 | date: Thu Jan 01 00:00:00 1970 +0000
1336 | instability: content-divergent 1313 | instability: content-divergent
1337 | summary: Add B only 1314 | summary: Add B only
1338 | 1315 |
1339 | * changeset: 8:b18bc8331526 1316 | o changeset: 8:b18bc8331526
1340 |/ parent: 5:dd800401bd8c 1317 |/ parent: 5:dd800401bd8c
1341 | user: test 1318 | user: test
1342 | date: Thu Jan 01 00:00:00 1970 +0000 1319 | date: Thu Jan 01 00:00:00 1970 +0000
1343 | instability: content-divergent 1320 | instability: content-divergent
1344 | summary: Add only B 1321 | summary: Add only B
1345 | 1322 |
1346 | * changeset: 7:ba2ed02b0c9a 1323 | o changeset: 7:ba2ed02b0c9a
1347 | | user: test 1324 | | user: test
1348 | | date: Thu Jan 01 00:00:00 1970 +0000 1325 | | date: Thu Jan 01 00:00:00 1970 +0000
1349 | | instability: orphan, content-divergent 1326 | | instability: orphan, content-divergent
1350 | | summary: Add A,B,C 1327 | | summary: Add A,B,C
1351 | | 1328 | |
1354 | date: Thu Jan 01 00:00:00 1970 +0000 1331 | date: Thu Jan 01 00:00:00 1970 +0000
1355 | obsolete: reworded using amend as 8:b18bc8331526 1332 | obsolete: reworded using amend as 8:b18bc8331526
1356 | obsolete: reworded using amend as 9:0b997eb7ceee 1333 | obsolete: reworded using amend as 9:0b997eb7ceee
1357 | summary: Add A,B,C 1334 | summary: Add A,B,C
1358 | 1335 |
1359 * changeset: 5:dd800401bd8c 1336 o changeset: 5:dd800401bd8c
1360 | parent: 3:f897c6137566 1337 | parent: 3:f897c6137566
1361 | user: test 1338 | user: test
1362 | date: Thu Jan 01 00:00:00 1970 +0000 1339 | date: Thu Jan 01 00:00:00 1970 +0000
1363 | instability: content-divergent 1340 | instability: content-divergent
1364 | summary: Add A,B,C 1341 | summary: Add A,B,C
1379 1356
1380 $ hg tlog 1357 $ hg tlog
1381 @ 0b997eb7ceee 1358 @ 0b997eb7ceee
1382 | Precursors: 6:4a004186e638 1359 | Precursors: 6:4a004186e638
1383 | semi-colon: 6:4a004186e638 1360 | semi-colon: 6:4a004186e638
1384 | * b18bc8331526 1361 | o b18bc8331526
1385 |/ Precursors: 6:4a004186e638 1362 |/ Precursors: 6:4a004186e638
1386 | semi-colon: 6:4a004186e638 1363 | semi-colon: 6:4a004186e638
1387 | * ba2ed02b0c9a 1364 | o ba2ed02b0c9a
1388 | | 1365 | |
1389 | x 4a004186e638 1366 | x 4a004186e638
1390 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee 1367 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1391 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1368 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1392 | Fate: reworded using amend as 8:b18bc8331526 1369 | Fate: reworded using amend as 8:b18bc8331526
1393 | Fate: reworded using amend as 9:0b997eb7ceee 1370 | Fate: reworded using amend as 9:0b997eb7ceee
1394 | 1371 |
1395 * dd800401bd8c 1372 o dd800401bd8c
1396 | 1373 |
1397 o f897c6137566 1374 o f897c6137566
1398 | 1375 |
1399 o ea207398892e 1376 o ea207398892e
1400 1377
1401 $ hg fatelog 1378 $ hg fatelog
1402 @ 0b997eb7ceee 1379 @ 0b997eb7ceee
1403 | 1380 |
1404 | * b18bc8331526 1381 | o b18bc8331526
1405 |/ 1382 |/
1406 | * ba2ed02b0c9a 1383 | o ba2ed02b0c9a
1407 | | 1384 | |
1408 | x 4a004186e638 1385 | x 4a004186e638
1409 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee 1386 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
1410 | 1387 |
1411 * dd800401bd8c 1388 o dd800401bd8c
1412 | 1389 |
1413 o f897c6137566 1390 o f897c6137566
1414 | 1391 |
1415 o ea207398892e 1392 o ea207398892e
1416 1393
1417 $ hg tlog --hidden 1394 $ hg tlog --hidden
1418 @ 0b997eb7ceee 1395 @ 0b997eb7ceee
1419 | Precursors: 6:4a004186e638 1396 | Precursors: 6:4a004186e638
1420 | semi-colon: 6:4a004186e638 1397 | semi-colon: 6:4a004186e638
1421 | * b18bc8331526 1398 | o b18bc8331526
1422 |/ Precursors: 6:4a004186e638 1399 |/ Precursors: 6:4a004186e638
1423 | semi-colon: 6:4a004186e638 1400 | semi-colon: 6:4a004186e638
1424 | * ba2ed02b0c9a 1401 | o ba2ed02b0c9a
1425 | | Precursors: 4:9bd10a0775e4 1402 | | Precursors: 4:9bd10a0775e4
1426 | | semi-colon: 4:9bd10a0775e4 1403 | | semi-colon: 4:9bd10a0775e4
1427 | x 4a004186e638 1404 | x 4a004186e638
1428 |/ Precursors: 4:9bd10a0775e4 1405 |/ Precursors: 4:9bd10a0775e4
1429 | semi-colon: 4:9bd10a0775e4 1406 | semi-colon: 4:9bd10a0775e4
1430 | Successors: 8:b18bc8331526; 9:0b997eb7ceee 1407 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1431 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee 1408 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
1432 | Fate: reworded using amend as 8:b18bc8331526 1409 | Fate: reworded using amend as 8:b18bc8331526
1433 | Fate: reworded using amend as 9:0b997eb7ceee 1410 | Fate: reworded using amend as 9:0b997eb7ceee
1434 | 1411 |
1435 * dd800401bd8c 1412 o dd800401bd8c
1436 | Precursors: 4:9bd10a0775e4 1413 | Precursors: 4:9bd10a0775e4
1437 | semi-colon: 4:9bd10a0775e4 1414 | semi-colon: 4:9bd10a0775e4
1438 | x 9bd10a0775e4 1415 | x 9bd10a0775e4
1439 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1416 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1440 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a 1417 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1461 o ea207398892e 1438 o ea207398892e
1462 1439
1463 $ hg fatelog --hidden 1440 $ hg fatelog --hidden
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 | x 9bd10a0775e4 1452 | x 9bd10a0775e4
1476 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a 1453 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
1477 | 1454 |
1478 o f897c6137566 1455 o f897c6137566
1484 |/ Obsfate: rewritten as 2:0dec01379d3b 1461 |/ Obsfate: rewritten as 2:0dec01379d3b
1485 | 1462 |
1486 o ea207398892e 1463 o ea207398892e
1487 1464
1488 $ hg up --hidden 4 1465 $ 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 1466 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1492 working directory parent is obsolete! (9bd10a0775e4) 1467 working directory parent is obsolete! (9bd10a0775e4)
1493 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1468 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1494 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1469 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1495 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1470 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1496 $ hg tlog 1471 $ hg tlog
1497 * eceed8f98ffc 1472 o eceed8f98ffc
1498 | Precursors: 4:9bd10a0775e4 1473 | Precursors: 4:9bd10a0775e4
1499 | semi-colon: 4:9bd10a0775e4 1474 | semi-colon: 4:9bd10a0775e4
1500 | * 0b997eb7ceee 1475 | o 0b997eb7ceee
1501 | | Precursors: 4:9bd10a0775e4 1476 | | Precursors: 4:9bd10a0775e4
1502 | | semi-colon: 4:9bd10a0775e4 1477 | | semi-colon: 4:9bd10a0775e4
1503 * | b18bc8331526 1478 o | b18bc8331526
1504 |/ Precursors: 4:9bd10a0775e4 1479 |/ Precursors: 4:9bd10a0775e4
1505 | semi-colon: 4:9bd10a0775e4 1480 | semi-colon: 4:9bd10a0775e4
1506 * dd800401bd8c 1481 o dd800401bd8c
1507 | Precursors: 4:9bd10a0775e4 1482 | Precursors: 4:9bd10a0775e4
1508 | semi-colon: 4:9bd10a0775e4 1483 | semi-colon: 4:9bd10a0775e4
1509 | @ 9bd10a0775e4 1484 | @ 9bd10a0775e4
1510 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc 1485 |/ 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 1486 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1515 o f897c6137566 1490 o f897c6137566
1516 | 1491 |
1517 o ea207398892e 1492 o ea207398892e
1518 1493
1519 $ hg fatelog 1494 $ hg fatelog
1520 * eceed8f98ffc 1495 o eceed8f98ffc
1521 | 1496 |
1522 | * 0b997eb7ceee 1497 | o 0b997eb7ceee
1523 | | 1498 | |
1524 * | b18bc8331526 1499 o | b18bc8331526
1525 |/ 1500 |/
1526 * dd800401bd8c 1501 o dd800401bd8c
1527 | 1502 |
1528 | @ 9bd10a0775e4 1503 | @ 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 1504 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
1530 | 1505 |
1531 o f897c6137566 1506 o f897c6137566
1549 1524
1550 Check output 1525 Check output
1551 ------------ 1526 ------------
1552 1527
1553 $ hg up "desc(A0)" --hidden 1528 $ 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 1529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1557 working directory parent is obsolete! (471f378eab4c) 1530 working directory parent is obsolete! (471f378eab4c)
1558 (use 'hg evolve' to update to its parent successor) 1531 (use 'hg evolve' to update to its parent successor)
1559 $ hg tlog 1532 $ hg tlog
1560 @ 471f378eab4c 1533 @ 471f378eab4c