Mercurial > evolve

comparison tests/test-evolve-templates.t @ 5318:88f9bbba392d mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:50:09 +0800
parents 1752a2e7a226 011b53a9d03c
children 15406dfa60e1
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
66 summary: ROOT 66 summary: ROOT
67 67
68 Check templates 68 Check templates
69 --------------- 69 ---------------
70 $ hg up 'desc(A0)' --hidden 70 $ hg up 'desc(A0)' --hidden
71 updating to a hidden changeset 471f378eab4c
72 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 73 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 updated to hidden changeset 471f378eab4c
73 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
74 working directory parent is obsolete! (471f378eab4c) 74 working directory parent is obsolete! (471f378eab4c)
75 (use 'hg evolve' to update to its successor: d004c8f274b9) 75 (use 'hg evolve' to update to its successor: d004c8f274b9)
76 76
77 Predecessors template should show current revision as it is the working copy 77 Predecessors template should show current revision as it is the working copy
78 $ hg olog tip 78 $ hg olog tip
164 |/ 164 |/
165 o "" 165 o ""
166 166
167 167
168 $ hg up 'desc(A1)' --hidden 168 $ hg up 'desc(A1)' --hidden
169 updating to a hidden changeset a468dc9b3633
170 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 171 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
170 updated to hidden changeset a468dc9b3633
171 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
172 working directory parent is obsolete! (a468dc9b3633) 172 working directory parent is obsolete! (a468dc9b3633)
173 (use 'hg evolve' to update to its successor: d004c8f274b9) 173 (use 'hg evolve' to update to its successor: d004c8f274b9)
174 174
175 Predecessors template should show current revision as it is the working copy 175 Predecessors template should show current revision as it is the working copy
176 $ hg tlog 176 $ hg tlog
351 351
352 Check templates 352 Check templates
353 --------------- 353 ---------------
354 354
355 $ hg up 'obsolete()' --hidden 355 $ hg up 'obsolete()' --hidden
356 updating to a hidden changeset 471597cad322
357 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
356 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
357 updated to hidden changeset 471597cad322
358 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
359 working directory parent is obsolete! (471597cad322) 359 working directory parent is obsolete! (471597cad322)
360 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 360 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
361 361
362 Predecessors template should show current revision as it is the working copy 362 Predecessors template should show current revision as it is the working copy
363 $ hg tlog 363 $ hg tlog
494 494
495 Check templates 495 Check templates
496 --------------- 496 ---------------
497 497
498 $ hg up 'desc(A0)' --hidden 498 $ hg up 'desc(A0)' --hidden
499 updating to a hidden changeset 471f378eab4c
500 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
499 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 501 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
500 updated to hidden changeset 471f378eab4c
501 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
502 working directory parent is obsolete! (471f378eab4c) 502 working directory parent is obsolete! (471f378eab4c)
503 (use 'hg evolve' to update to its successor: eb5a0daa2192) 503 (use 'hg evolve' to update to its successor: eb5a0daa2192)
504 504
505 Predecessors template should show current revision as it is the working copy 505 Predecessors template should show current revision as it is the working copy
506 $ hg tlog 506 $ hg tlog
524 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 524 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
525 | 525 |
526 o ea207398892e 526 o ea207398892e
527 527
528 $ hg up 'desc(B0)' --hidden 528 $ hg up 'desc(B0)' --hidden
529 updating to a hidden changeset 0dec01379d3b
530 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 531 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 updated to hidden changeset 0dec01379d3b
531 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
532 working directory parent is obsolete! (0dec01379d3b) 532 working directory parent is obsolete! (0dec01379d3b)
533 (use 'hg evolve' to update to its successor: eb5a0daa2192) 533 (use 'hg evolve' to update to its successor: eb5a0daa2192)
534 534
535 Predecessors template should show both predecessors as they should be both 535 Predecessors template should show both predecessors as they should be both
536 displayed 536 displayed
639 user: test 639 user: test
640 date: Thu Jan 01 00:00:00 1970 +0000 640 date: Thu Jan 01 00:00:00 1970 +0000
641 summary: ROOT 641 summary: ROOT
642 642
643 $ hg update --hidden 'desc(A0)' 643 $ hg update --hidden 'desc(A0)'
644 updating to a hidden changeset 471f378eab4c
645 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
644 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 646 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
645 updated to hidden changeset 471f378eab4c
646 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
647 working directory parent is obsolete! (471f378eab4c) 647 working directory parent is obsolete! (471f378eab4c)
648 (use 'hg evolve' to update to its successor: fdf9bde5129a) 648 (use 'hg evolve' to update to its successor: fdf9bde5129a)
649 $ hg amend -m "A2" 649 $ hg amend -m "A2"
650 2 new content-divergent changesets 650 2 new content-divergent changesets
651 $ hg log --hidden -G 651 $ hg log --hidden -G
680 680
681 Check templates 681 Check templates
682 --------------- 682 ---------------
683 683
684 $ hg up 'desc(A0)' --hidden 684 $ hg up 'desc(A0)' --hidden
685 updating to a hidden changeset 471f378eab4c
686 (hidden revision '471f378eab4c' has diverged)
685 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 687 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
686 updated to hidden changeset 471f378eab4c
687 (hidden revision '471f378eab4c' has diverged)
688 working directory parent is obsolete! (471f378eab4c) 688 working directory parent is obsolete! (471f378eab4c)
689 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 689 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
690 690
691 Predecessors template should show current revision as it is the working copy 691 Predecessors template should show current revision as it is the working copy
692 $ hg tlog 692 $ hg tlog
858 858
859 Check templates 859 Check templates
860 --------------- 860 ---------------
861 861
862 $ hg up 'desc(A0)' --hidden 862 $ hg up 'desc(A0)' --hidden
863 updating to a hidden changeset 471f378eab4c
864 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
863 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 865 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
864 updated to hidden changeset 471f378eab4c
865 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
866 working directory parent is obsolete! (471f378eab4c) 866 working directory parent is obsolete! (471f378eab4c)
867 (use 'hg evolve' to update to its successor: eb5a0daa2192) 867 (use 'hg evolve' to update to its successor: eb5a0daa2192)
868 $ hg tlog 868 $ hg tlog
869 o eb5a0daa2192 869 o eb5a0daa2192
870 | Predecessors: 1:471f378eab4c 870 | Predecessors: 1:471f378eab4c
886 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 886 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
887 | 887 |
888 o ea207398892e 888 o ea207398892e
889 889
890 $ hg up 'desc(B0)' --hidden 890 $ hg up 'desc(B0)' --hidden
891 updating to a hidden changeset 0dec01379d3b
892 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
891 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 893 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
892 updated to hidden changeset 0dec01379d3b
893 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
894 working directory parent is obsolete! (0dec01379d3b) 894 working directory parent is obsolete! (0dec01379d3b)
895 (use 'hg evolve' to update to its successor: eb5a0daa2192) 895 (use 'hg evolve' to update to its successor: eb5a0daa2192)
896 $ hg tlog 896 $ hg tlog
897 o eb5a0daa2192 897 o eb5a0daa2192
898 | Predecessors: 2:0dec01379d3b 1:471f378eab4c 898 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
924 | 924 |
925 o ea207398892e 925 o ea207398892e
926 926
927 927
928 $ hg up 'desc(B1)' --hidden 928 $ hg up 'desc(B1)' --hidden
929 updating to a hidden changeset b7ea6d14e664
930 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
929 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 931 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
930 updated to hidden changeset b7ea6d14e664
931 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
932 working directory parent is obsolete! (b7ea6d14e664) 932 working directory parent is obsolete! (b7ea6d14e664)
933 (use 'hg evolve' to update to its successor: eb5a0daa2192) 933 (use 'hg evolve' to update to its successor: eb5a0daa2192)
934 $ hg tlog 934 $ hg tlog
935 o eb5a0daa2192 935 o eb5a0daa2192
936 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 936 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
1199 @ f897c6137566 1199 @ f897c6137566
1200 | 1200 |
1201 o ea207398892e 1201 o ea207398892e
1202 1202
1203 $ hg up -r "desc(B0)" --hidden 1203 $ hg up -r "desc(B0)" --hidden
1204 updating to a hidden changeset 0dec01379d3b
1205 (hidden revision '0dec01379d3b' is pruned)
1204 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1206 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1205 updated to hidden changeset 0dec01379d3b
1206 (hidden revision '0dec01379d3b' is pruned)
1207 working directory parent is obsolete! (0dec01379d3b) 1207 working directory parent is obsolete! (0dec01379d3b)
1208 (use 'hg evolve' to update to its parent successor) 1208 (use 'hg evolve' to update to its parent successor)
1209 $ hg tlog 1209 $ hg tlog
1210 o f897c6137566 1210 o f897c6137566
1211 | Predecessors: 2:0dec01379d3b 1211 | Predecessors: 2:0dec01379d3b
1606 | Obsorigin: rewritten from 2:0dec01379d3b 1606 | Obsorigin: rewritten from 2:0dec01379d3b
1607 | 1607 |
1608 o ea207398892e 1608 o ea207398892e
1609 1609
1610 $ hg up --hidden 4 1610 $ hg up --hidden 4
1611 updating to a hidden changeset 9bd10a0775e4
1612 (hidden revision '9bd10a0775e4' has diverged)
1611 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1613 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1612 updated to hidden changeset 9bd10a0775e4
1613 (hidden revision '9bd10a0775e4' has diverged)
1614 working directory parent is obsolete! (9bd10a0775e4) 1614 working directory parent is obsolete! (9bd10a0775e4)
1615 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1615 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1616 $ hg rebase -r 7 -d 8 --config extensions.rebase= 1616 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1617 rebasing 7:ba2ed02b0c9a "Add A,B,C" 1617 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1618 $ hg tlog 1618 $ hg tlog
1683 1683
1684 Check output 1684 Check output
1685 ------------ 1685 ------------
1686 1686
1687 $ hg up "desc(A0)" --hidden 1687 $ hg up "desc(A0)" --hidden
1688 updating to a hidden changeset 471f378eab4c
1689 (hidden revision '471f378eab4c' is pruned)
1688 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1690 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1689 updated to hidden changeset 471f378eab4c
1690 (hidden revision '471f378eab4c' is pruned)
1691 working directory parent is obsolete! (471f378eab4c) 1691 working directory parent is obsolete! (471f378eab4c)
1692 (use 'hg evolve' to update to its parent successor) 1692 (use 'hg evolve' to update to its parent successor)
1693 $ hg tlog 1693 $ hg tlog
1694 @ 471f378eab4c 1694 @ 471f378eab4c
1695 | Fate: pruned using prune 1695 | Fate: pruned using prune