Mercurial > evolve

comparison tests/test-evolve-templates.t @ 3914:96945ea908df stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 12:52:06 +0200
parents 1e103c7f7663
children f7afd3a158e3 ef22eef37ecc
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
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 66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 updated to hidden changeset 471f378eab4c
67 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) 68 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 working directory parent is obsolete! (471f378eab4c) 69 working directory parent is obsolete! (471f378eab4c)
70 (use 'hg evolve' to update to its successor: d004c8f274b9) 70 (use 'hg evolve' to update to its successor: d004c8f274b9)
71 71
72 Precursors template should show current revision as it is the working copy 72 Precursors template should show current revision as it is the working copy
73 $ hg olog tip 73 $ hg olog tip
154 |/ 154 |/
155 o "" 155 o ""
156 156
157 157
158 $ hg up 'desc(A1)' --hidden 158 $ hg up 'desc(A1)' --hidden
159 updating to a hidden changeset a468dc9b3633 159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
160 updated to hidden changeset a468dc9b3633
160 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) 161 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
162 working directory parent is obsolete! (a468dc9b3633) 162 working directory parent is obsolete! (a468dc9b3633)
163 (use 'hg evolve' to update to its successor: d004c8f274b9) 163 (use 'hg evolve' to update to its successor: d004c8f274b9)
164 164
165 Precursors template should show current revision as it is the working copy 165 Precursors template should show current revision as it is the working copy
166 $ hg tlog 166 $ hg tlog
330 330
331 Check templates 331 Check templates
332 --------------- 332 ---------------
333 333
334 $ hg up 'obsolete()' --hidden 334 $ hg up 'obsolete()' --hidden
335 updating to a hidden changeset 471597cad322 335 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336 updated to hidden changeset 471597cad322
336 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 337 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 working directory parent is obsolete! (471597cad322) 338 working directory parent is obsolete! (471597cad322)
339 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 339 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
340 340
341 Precursors template should show current revision as it is the working copy 341 Precursors template should show current revision as it is the working copy
342 $ hg tlog 342 $ hg tlog
461 461
462 Check templates 462 Check templates
463 --------------- 463 ---------------
464 464
465 $ hg up 'desc(A0)' --hidden 465 $ hg up 'desc(A0)' --hidden
466 updating to a hidden changeset 471f378eab4c 466 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
467 updated to hidden changeset 471f378eab4c
467 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 468 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
468 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
469 working directory parent is obsolete! (471f378eab4c) 469 working directory parent is obsolete! (471f378eab4c)
470 (use 'hg evolve' to update to its successor: eb5a0daa2192) 470 (use 'hg evolve' to update to its successor: eb5a0daa2192)
471 471
472 Precursors template should show current revision as it is the working copy 472 Precursors template should show current revision as it is the working copy
473 $ hg tlog 473 $ hg tlog
488 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 488 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
489 | 489 |
490 o ea207398892e 490 o ea207398892e
491 491
492 $ hg up 'desc(B0)' --hidden 492 $ hg up 'desc(B0)' --hidden
493 updating to a hidden changeset 0dec01379d3b 493 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
494 updated to hidden changeset 0dec01379d3b
494 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 495 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
496 working directory parent is obsolete! (0dec01379d3b) 496 working directory parent is obsolete! (0dec01379d3b)
497 (use 'hg evolve' to update to its successor: eb5a0daa2192) 497 (use 'hg evolve' to update to its successor: eb5a0daa2192)
498 498
499 Precursors template should show both precursors as they should be both 499 Precursors template should show both precursors as they should be both
500 displayed 500 displayed
595 user: test 595 user: test
596 date: Thu Jan 01 00:00:00 1970 +0000 596 date: Thu Jan 01 00:00:00 1970 +0000
597 summary: ROOT 597 summary: ROOT
598 598
599 $ hg update --hidden 'desc(A0)' 599 $ hg update --hidden 'desc(A0)'
600 updating to a hidden changeset 471f378eab4c 600 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
601 updated to hidden changeset 471f378eab4c
601 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 602 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
602 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
603 working directory parent is obsolete! (471f378eab4c) 603 working directory parent is obsolete! (471f378eab4c)
604 (use 'hg evolve' to update to its successor: fdf9bde5129a) 604 (use 'hg evolve' to update to its successor: fdf9bde5129a)
605 $ hg amend -m "A2" 605 $ hg amend -m "A2"
606 2 new content-divergent changesets 606 2 new content-divergent changesets
607 $ hg log --hidden -G 607 $ hg log --hidden -G
636 636
637 Check templates 637 Check templates
638 --------------- 638 ---------------
639 639
640 $ hg up 'desc(A0)' --hidden 640 $ hg up 'desc(A0)' --hidden
641 updating to a hidden changeset 471f378eab4c 641 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
642 updated to hidden changeset 471f378eab4c
642 (hidden revision '471f378eab4c' has diverged) 643 (hidden revision '471f378eab4c' has diverged)
643 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 working directory parent is obsolete! (471f378eab4c) 644 working directory parent is obsolete! (471f378eab4c)
645 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 645 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
646 646
647 Precursors template should show current revision as it is the working copy 647 Precursors template should show current revision as it is the working copy
648 $ hg tlog 648 $ hg tlog
800 800
801 Check templates 801 Check templates
802 --------------- 802 ---------------
803 803
804 $ hg up 'desc(A0)' --hidden 804 $ hg up 'desc(A0)' --hidden
805 updating to a hidden changeset 471f378eab4c 805 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
806 updated to hidden changeset 471f378eab4c
806 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 807 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
807 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
808 working directory parent is obsolete! (471f378eab4c) 808 working directory parent is obsolete! (471f378eab4c)
809 (use 'hg evolve' to update to its successor: eb5a0daa2192) 809 (use 'hg evolve' to update to its successor: eb5a0daa2192)
810 $ hg tlog 810 $ hg tlog
811 o eb5a0daa2192 811 o eb5a0daa2192
812 | Precursors: 1:471f378eab4c 812 | Precursors: 1:471f378eab4c
825 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 825 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
826 | 826 |
827 o ea207398892e 827 o ea207398892e
828 828
829 $ hg up 'desc(B0)' --hidden 829 $ hg up 'desc(B0)' --hidden
830 updating to a hidden changeset 0dec01379d3b 830 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
831 updated to hidden changeset 0dec01379d3b
831 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 832 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
832 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
833 working directory parent is obsolete! (0dec01379d3b) 833 working directory parent is obsolete! (0dec01379d3b)
834 (use 'hg evolve' to update to its successor: eb5a0daa2192) 834 (use 'hg evolve' to update to its successor: eb5a0daa2192)
835 $ hg tlog 835 $ hg tlog
836 o eb5a0daa2192 836 o eb5a0daa2192
837 | Precursors: 2:0dec01379d3b 1:471f378eab4c 837 | Precursors: 2:0dec01379d3b 1:471f378eab4c
859 | 859 |
860 o ea207398892e 860 o ea207398892e
861 861
862 862
863 $ hg up 'desc(B1)' --hidden 863 $ hg up 'desc(B1)' --hidden
864 updating to a hidden changeset b7ea6d14e664 864 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
865 updated to hidden changeset b7ea6d14e664
865 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) 866 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
866 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
867 working directory parent is obsolete! (b7ea6d14e664) 867 working directory parent is obsolete! (b7ea6d14e664)
868 (use 'hg evolve' to update to its successor: eb5a0daa2192) 868 (use 'hg evolve' to update to its successor: eb5a0daa2192)
869 $ hg tlog 869 $ hg tlog
870 o eb5a0daa2192 870 o eb5a0daa2192
871 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 871 | Precursors: 1:471f378eab4c 3:b7ea6d14e664
1118 @ f897c6137566 1118 @ f897c6137566
1119 | 1119 |
1120 o ea207398892e 1120 o ea207398892e
1121 1121
1122 $ hg up -r "desc(B0)" --hidden 1122 $ hg up -r "desc(B0)" --hidden
1123 updating to a hidden changeset 0dec01379d3b 1123 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1124 updated to hidden changeset 0dec01379d3b
1124 (hidden revision '0dec01379d3b' is pruned) 1125 (hidden revision '0dec01379d3b' is pruned)
1125 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1126 working directory parent is obsolete! (0dec01379d3b) 1126 working directory parent is obsolete! (0dec01379d3b)
1127 (use 'hg evolve' to update to its parent successor) 1127 (use 'hg evolve' to update to its parent successor)
1128 $ hg tlog 1128 $ hg tlog
1129 o f897c6137566 1129 o f897c6137566
1130 | Precursors: 2:0dec01379d3b 1130 | Precursors: 2:0dec01379d3b
1484 |/ Obsfate: rewritten as 2:0dec01379d3b 1484 |/ Obsfate: rewritten as 2:0dec01379d3b
1485 | 1485 |
1486 o ea207398892e 1486 o ea207398892e
1487 1487
1488 $ hg up --hidden 4 1488 $ hg up --hidden 4
1489 updating to a hidden changeset 9bd10a0775e4 1489 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1490 updated to hidden changeset 9bd10a0775e4
1490 (hidden revision '9bd10a0775e4' has diverged) 1491 (hidden revision '9bd10a0775e4' has diverged)
1491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1492 working directory parent is obsolete! (9bd10a0775e4) 1492 working directory parent is obsolete! (9bd10a0775e4)
1493 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1493 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1494 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1494 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1495 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1495 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1496 $ hg tlog 1496 $ hg tlog
1549 1549
1550 Check output 1550 Check output
1551 ------------ 1551 ------------
1552 1552
1553 $ hg up "desc(A0)" --hidden 1553 $ hg up "desc(A0)" --hidden
1554 updating to a hidden changeset 471f378eab4c 1554 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1555 updated to hidden changeset 471f378eab4c
1555 (hidden revision '471f378eab4c' is pruned) 1556 (hidden revision '471f378eab4c' is pruned)
1556 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1557 working directory parent is obsolete! (471f378eab4c) 1557 working directory parent is obsolete! (471f378eab4c)
1558 (use 'hg evolve' to update to its parent successor) 1558 (use 'hg evolve' to update to its parent successor)
1559 $ hg tlog 1559 $ hg tlog
1560 @ 471f378eab4c 1560 @ 471f378eab4c
1561 | Fate: pruned using prune 1561 | Fate: pruned using prune