Mercurial > evolve
comparison tests/test-evolve-templates.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 31 Jan 2021 16:15:26 +0800 |
| parents | 8d93e7fc0daa |
| children | 15406dfa60e1 55e9987b8384 |
comparison
equal
deleted
inserted
replaced
| 5765:98e87c181e0f | 5766:82da27321e91 |
|---|---|
| 476 | summary: C0 | 476 | summary: C0 |
| 477 | | 477 | |
| 478 | x changeset: 2:0dec01379d3b | 478 | x changeset: 2:0dec01379d3b |
| 479 | | user: test | 479 | | user: test |
| 480 | | date: Thu Jan 01 00:00:00 1970 +0000 | 480 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 481 | | obsolete: folded using fold as 3:eb5a0daa2192 | 481 | | obsolete: rewritten using fold as 3:eb5a0daa2192 |
| 482 | | summary: B0 | 482 | | summary: B0 |
| 483 | | | 483 | | |
| 484 | x changeset: 1:471f378eab4c | 484 | x changeset: 1:471f378eab4c |
| 485 |/ user: test | 485 |/ user: test |
| 486 | date: Thu Jan 01 00:00:00 1970 +0000 | 486 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 487 | obsolete: folded using fold as 3:eb5a0daa2192 | 487 | obsolete: rewritten using fold as 3:eb5a0daa2192 |
| 488 | summary: A0 | 488 | summary: A0 |
| 489 | | 489 | |
| 490 o changeset: 0:ea207398892e | 490 o changeset: 0:ea207398892e |
| 491 user: test | 491 user: test |
| 492 date: Thu Jan 01 00:00:00 1970 +0000 | 492 date: Thu Jan 01 00:00:00 1970 +0000 |
| 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 |
| 507 o eb5a0daa2192 | 507 o eb5a0daa2192 |
| 508 | Predecessors: 1:471f378eab4c | 508 | Predecessors: 1:471f378eab4c |
| 509 | semi-colon: 1:471f378eab4c | 509 | semi-colon: 1:471f378eab4c |
| 510 | Origin: folded using fold from 1:471f378eab4c | 510 | Origin: rewritten using fold from 1:471f378eab4c |
| 511 | | 511 | |
| 512 | @ 471f378eab4c | 512 | @ 471f378eab4c |
| 513 |/ Successors: 3:eb5a0daa2192 | 513 |/ Successors: 3:eb5a0daa2192 |
| 514 | semi-colon: 3:eb5a0daa2192 | 514 | semi-colon: 3:eb5a0daa2192 |
| 515 | Fate: folded using fold as 3:eb5a0daa2192 | 515 | Fate: rewritten using fold as 3:eb5a0daa2192 |
| 516 | | 516 | |
| 517 o ea207398892e | 517 o ea207398892e |
| 518 | 518 |
| 519 $ hg fateoriginlog | 519 $ hg fateoriginlog |
| 520 o eb5a0daa2192 | 520 o eb5a0daa2192 |
| 521 | Obsorigin: folded using fold from 1:471f378eab4c | 521 | Obsorigin: rewritten using fold from 1:471f378eab4c |
| 522 | | 522 | |
| 523 | @ 471f378eab4c | 523 | @ 471f378eab4c |
| 524 |/ Obsfate: folded 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 536 displayed | 536 displayed |
| 537 $ hg tlog | 537 $ hg tlog |
| 538 o eb5a0daa2192 | 538 o eb5a0daa2192 |
| 539 | Predecessors: 2:0dec01379d3b 1:471f378eab4c | 539 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
| 540 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 540 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 541 | Origin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b | 541 | Origin: rewritten using fold from 2:0dec01379d3b |
| 542 | Origin: rewritten using fold from 1:471f378eab4c | |
| 542 | | 543 | |
| 543 | @ 0dec01379d3b | 544 | @ 0dec01379d3b |
| 544 | | Successors: 3:eb5a0daa2192 | 545 | | Successors: 3:eb5a0daa2192 |
| 545 | | semi-colon: 3:eb5a0daa2192 | 546 | | semi-colon: 3:eb5a0daa2192 |
| 546 | | Fate: folded using fold as 3:eb5a0daa2192 | 547 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
| 547 | | | 548 | | |
| 548 | x 471f378eab4c | 549 | x 471f378eab4c |
| 549 |/ Successors: 3:eb5a0daa2192 | 550 |/ Successors: 3:eb5a0daa2192 |
| 550 | semi-colon: 3:eb5a0daa2192 | 551 | semi-colon: 3:eb5a0daa2192 |
| 551 | Fate: folded using fold as 3:eb5a0daa2192 | 552 | Fate: rewritten using fold as 3:eb5a0daa2192 |
| 552 | | 553 | |
| 553 o ea207398892e | 554 o ea207398892e |
| 554 | 555 |
| 555 $ hg fateoriginlog | 556 $ hg fateoriginlog |
| 556 o eb5a0daa2192 | 557 o eb5a0daa2192 |
| 557 | Obsorigin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b | 558 | Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c |
| 558 | | 559 | |
| 559 | @ 0dec01379d3b | 560 | @ 0dec01379d3b |
| 560 | | Obsfate: folded using fold as 3:eb5a0daa2192 | 561 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
| 561 | | | 562 | | |
| 562 | x 471f378eab4c | 563 | x 471f378eab4c |
| 563 |/ Obsfate: folded using fold as 3:eb5a0daa2192 | 564 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
| 564 | | 565 | |
| 565 o ea207398892e | 566 o ea207398892e |
| 566 | 567 |
| 567 | 568 |
| 568 $ hg up 'desc(C0)' | 569 $ hg up 'desc(C0)' |
| 579 --hidden | 580 --hidden |
| 580 $ hg tlog --hidden | 581 $ hg tlog --hidden |
| 581 @ eb5a0daa2192 | 582 @ eb5a0daa2192 |
| 582 | Predecessors: 2:0dec01379d3b 1:471f378eab4c | 583 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
| 583 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 584 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 584 | Origin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b | 585 | Origin: rewritten using fold from 2:0dec01379d3b |
| 586 | Origin: rewritten using fold from 1:471f378eab4c | |
| 585 | | 587 | |
| 586 | x 0dec01379d3b | 588 | x 0dec01379d3b |
| 587 | | Successors: 3:eb5a0daa2192 | 589 | | Successors: 3:eb5a0daa2192 |
| 588 | | semi-colon: 3:eb5a0daa2192 | 590 | | semi-colon: 3:eb5a0daa2192 |
| 589 | | Fate: folded using fold as 3:eb5a0daa2192 | 591 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
| 590 | | | 592 | | |
| 591 | x 471f378eab4c | 593 | x 471f378eab4c |
| 592 |/ Successors: 3:eb5a0daa2192 | 594 |/ Successors: 3:eb5a0daa2192 |
| 593 | semi-colon: 3:eb5a0daa2192 | 595 | semi-colon: 3:eb5a0daa2192 |
| 594 | Fate: folded using fold as 3:eb5a0daa2192 | 596 | Fate: rewritten using fold as 3:eb5a0daa2192 |
| 595 | | 597 | |
| 596 o ea207398892e | 598 o ea207398892e |
| 597 | 599 |
| 598 $ hg fateoriginlog --hidden | 600 $ hg fateoriginlog --hidden |
| 599 @ eb5a0daa2192 | 601 @ eb5a0daa2192 |
| 600 | Obsorigin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b | 602 | Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c |
| 601 | | 603 | |
| 602 | x 0dec01379d3b | 604 | x 0dec01379d3b |
| 603 | | Obsfate: folded using fold as 3:eb5a0daa2192 | 605 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
| 604 | | | 606 | | |
| 605 | x 471f378eab4c | 607 | x 471f378eab4c |
| 606 |/ Obsfate: folded using fold as 3:eb5a0daa2192 | 608 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
| 607 | | 609 | |
| 608 o ea207398892e | 610 o ea207398892e |
| 609 | 611 |
| 610 | 612 |
| 611 Test templates with divergence | 613 Test templates with divergence |
| 832 | | 834 | |
| 833 | x changeset: 3:b7ea6d14e664 | 835 | x changeset: 3:b7ea6d14e664 |
| 834 | | parent: 1:471f378eab4c | 836 | | parent: 1:471f378eab4c |
| 835 | | user: test | 837 | | user: test |
| 836 | | date: Thu Jan 01 00:00:00 1970 +0000 | 838 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 837 | | obsolete: folded using fold as 4:eb5a0daa2192 | 839 | | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 838 | | summary: B1 | 840 | | summary: B1 |
| 839 | | | 841 | | |
| 840 | | x changeset: 2:0dec01379d3b | 842 | | x changeset: 2:0dec01379d3b |
| 841 | |/ user: test | 843 | |/ user: test |
| 842 | | date: Thu Jan 01 00:00:00 1970 +0000 | 844 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 844 | | summary: B0 | 846 | | summary: B0 |
| 845 | | | 847 | | |
| 846 | x changeset: 1:471f378eab4c | 848 | x changeset: 1:471f378eab4c |
| 847 |/ user: test | 849 |/ user: test |
| 848 | date: Thu Jan 01 00:00:00 1970 +0000 | 850 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 849 | obsolete: folded using fold as 4:eb5a0daa2192 | 851 | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 850 | summary: A0 | 852 | summary: A0 |
| 851 | | 853 | |
| 852 o changeset: 0:ea207398892e | 854 o changeset: 0:ea207398892e |
| 853 user: test | 855 user: test |
| 854 date: Thu Jan 01 00:00:00 1970 +0000 | 856 date: Thu Jan 01 00:00:00 1970 +0000 |
| 865 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 867 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 866 $ hg tlog | 868 $ hg tlog |
| 867 o eb5a0daa2192 | 869 o eb5a0daa2192 |
| 868 | Predecessors: 1:471f378eab4c | 870 | Predecessors: 1:471f378eab4c |
| 869 | semi-colon: 1:471f378eab4c | 871 | semi-colon: 1:471f378eab4c |
| 870 | Origin: folded using fold from 1:471f378eab4c | 872 | Origin: rewritten using fold from 1:471f378eab4c |
| 871 | | 873 | |
| 872 | @ 471f378eab4c | 874 | @ 471f378eab4c |
| 873 |/ Successors: 4:eb5a0daa2192 | 875 |/ Successors: 4:eb5a0daa2192 |
| 874 | semi-colon: 4:eb5a0daa2192 | 876 | semi-colon: 4:eb5a0daa2192 |
| 875 | Fate: folded using fold as 4:eb5a0daa2192 | 877 | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 876 | | 878 | |
| 877 o ea207398892e | 879 o ea207398892e |
| 878 | 880 |
| 879 $ hg fateoriginlog | 881 $ hg fateoriginlog |
| 880 o eb5a0daa2192 | 882 o eb5a0daa2192 |
| 881 | Obsorigin: folded using fold from 1:471f378eab4c | 883 | Obsorigin: rewritten using fold from 1:471f378eab4c |
| 882 | | 884 | |
| 883 | @ 471f378eab4c | 885 | @ 471f378eab4c |
| 884 |/ Obsfate: folded using fold as 4:eb5a0daa2192 | 886 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 885 | | 887 | |
| 886 o ea207398892e | 888 o ea207398892e |
| 887 | 889 |
| 888 $ hg up 'desc(B0)' --hidden | 890 $ hg up 'desc(B0)' --hidden |
| 889 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 891 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 893 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 895 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 894 $ hg tlog | 896 $ hg tlog |
| 895 o eb5a0daa2192 | 897 o eb5a0daa2192 |
| 896 | Predecessors: 2:0dec01379d3b 1:471f378eab4c | 898 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
| 897 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | 899 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
| 898 | Origin: folded using amend, fold from 1:471f378eab4c, 2:0dec01379d3b | 900 | Origin: rewritten using amend, fold from 2:0dec01379d3b |
| 901 | Origin: rewritten using fold from 1:471f378eab4c | |
| 899 | | 902 | |
| 900 | @ 0dec01379d3b | 903 | @ 0dec01379d3b |
| 901 | | Successors: 4:eb5a0daa2192 | 904 | | Successors: 4:eb5a0daa2192 |
| 902 | | semi-colon: 4:eb5a0daa2192 | 905 | | semi-colon: 4:eb5a0daa2192 |
| 903 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 | 906 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 |
| 904 | | | 907 | | |
| 905 | x 471f378eab4c | 908 | x 471f378eab4c |
| 906 |/ Successors: 4:eb5a0daa2192 | 909 |/ Successors: 4:eb5a0daa2192 |
| 907 | semi-colon: 4:eb5a0daa2192 | 910 | semi-colon: 4:eb5a0daa2192 |
| 908 | Fate: folded using fold as 4:eb5a0daa2192 | 911 | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 909 | | 912 | |
| 910 o ea207398892e | 913 o ea207398892e |
| 911 | 914 |
| 912 $ hg fateoriginlog | 915 $ hg fateoriginlog |
| 913 o eb5a0daa2192 | 916 o eb5a0daa2192 |
| 914 | Obsorigin: folded using amend, fold from 1:471f378eab4c, 2:0dec01379d3b | 917 | Obsorigin: rewritten using amend, fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c |
| 915 | | 918 | |
| 916 | @ 0dec01379d3b | 919 | @ 0dec01379d3b |
| 917 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 | 920 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 |
| 918 | | | 921 | | |
| 919 | x 471f378eab4c | 922 | x 471f378eab4c |
| 920 |/ Obsfate: folded using fold as 4:eb5a0daa2192 | 923 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 921 | | 924 | |
| 922 o ea207398892e | 925 o ea207398892e |
| 923 | 926 |
| 924 | 927 |
| 925 $ hg up 'desc(B1)' --hidden | 928 $ hg up 'desc(B1)' --hidden |
| 930 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 933 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 931 $ hg tlog | 934 $ hg tlog |
| 932 o eb5a0daa2192 | 935 o eb5a0daa2192 |
| 933 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | 936 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
| 934 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | 937 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
| 935 | Origin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664 | 938 | Origin: rewritten using fold from 1:471f378eab4c |
| 939 | Origin: rewritten using fold from 3:b7ea6d14e664 | |
| 936 | | 940 | |
| 937 | @ b7ea6d14e664 | 941 | @ b7ea6d14e664 |
| 938 | | Successors: 4:eb5a0daa2192 | 942 | | Successors: 4:eb5a0daa2192 |
| 939 | | semi-colon: 4:eb5a0daa2192 | 943 | | semi-colon: 4:eb5a0daa2192 |
| 940 | | Fate: folded using fold as 4:eb5a0daa2192 | 944 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 941 | | | 945 | | |
| 942 | x 471f378eab4c | 946 | x 471f378eab4c |
| 943 |/ Successors: 4:eb5a0daa2192 | 947 |/ Successors: 4:eb5a0daa2192 |
| 944 | semi-colon: 4:eb5a0daa2192 | 948 | semi-colon: 4:eb5a0daa2192 |
| 945 | Fate: folded using fold as 4:eb5a0daa2192 | 949 | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 946 | | 950 | |
| 947 o ea207398892e | 951 o ea207398892e |
| 948 | 952 |
| 949 $ hg fateoriginlog | 953 $ hg fateoriginlog |
| 950 o eb5a0daa2192 | 954 o eb5a0daa2192 |
| 951 | Obsorigin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664 | 955 | Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664 |
| 952 | | 956 | |
| 953 | @ b7ea6d14e664 | 957 | @ b7ea6d14e664 |
| 954 | | Obsfate: folded using fold as 4:eb5a0daa2192 | 958 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 955 | | | 959 | | |
| 956 | x 471f378eab4c | 960 | x 471f378eab4c |
| 957 |/ Obsfate: folded using fold as 4:eb5a0daa2192 | 961 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 958 | | 962 | |
| 959 o ea207398892e | 963 o ea207398892e |
| 960 | 964 |
| 961 | 965 |
| 962 $ hg up 'desc(C0)' | 966 $ hg up 'desc(C0)' |
| 968 | 972 |
| 969 $ hg tlog --hidden | 973 $ hg tlog --hidden |
| 970 @ eb5a0daa2192 | 974 @ eb5a0daa2192 |
| 971 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | 975 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
| 972 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | 976 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
| 973 | Origin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664 | 977 | Origin: rewritten using fold from 1:471f378eab4c |
| 978 | Origin: rewritten using fold from 3:b7ea6d14e664 | |
| 974 | | 979 | |
| 975 | x b7ea6d14e664 | 980 | x b7ea6d14e664 |
| 976 | | Predecessors: 2:0dec01379d3b | 981 | | Predecessors: 2:0dec01379d3b |
| 977 | | semi-colon: 2:0dec01379d3b | 982 | | semi-colon: 2:0dec01379d3b |
| 978 | | Successors: 4:eb5a0daa2192 | 983 | | Successors: 4:eb5a0daa2192 |
| 979 | | semi-colon: 4:eb5a0daa2192 | 984 | | semi-colon: 4:eb5a0daa2192 |
| 980 | | Fate: folded using fold as 4:eb5a0daa2192 | 985 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 981 | | Origin: reworded using amend from 2:0dec01379d3b | 986 | | Origin: reworded using amend from 2:0dec01379d3b |
| 982 | | | 987 | | |
| 983 | | x 0dec01379d3b | 988 | | x 0dec01379d3b |
| 984 | |/ Successors: 3:b7ea6d14e664 | 989 | |/ Successors: 3:b7ea6d14e664 |
| 985 | | semi-colon: 3:b7ea6d14e664 | 990 | | semi-colon: 3:b7ea6d14e664 |
| 986 | | Fate: reworded using amend as 3:b7ea6d14e664 | 991 | | Fate: reworded using amend as 3:b7ea6d14e664 |
| 987 | | | 992 | | |
| 988 | x 471f378eab4c | 993 | x 471f378eab4c |
| 989 |/ Successors: 4:eb5a0daa2192 | 994 |/ Successors: 4:eb5a0daa2192 |
| 990 | semi-colon: 4:eb5a0daa2192 | 995 | semi-colon: 4:eb5a0daa2192 |
| 991 | Fate: folded using fold as 4:eb5a0daa2192 | 996 | Fate: rewritten using fold as 4:eb5a0daa2192 |
| 992 | | 997 | |
| 993 o ea207398892e | 998 o ea207398892e |
| 994 | 999 |
| 995 $ hg fateoriginlog --hidden | 1000 $ hg fateoriginlog --hidden |
| 996 @ eb5a0daa2192 | 1001 @ eb5a0daa2192 |
| 997 | Obsorigin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664 | 1002 | Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664 |
| 998 | | 1003 | |
| 999 | x b7ea6d14e664 | 1004 | x b7ea6d14e664 |
| 1000 | | Obsfate: folded using fold as 4:eb5a0daa2192 | 1005 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 1001 | | Obsorigin: reworded using amend from 2:0dec01379d3b | 1006 | | Obsorigin: reworded using amend from 2:0dec01379d3b |
| 1002 | | | 1007 | | |
| 1003 | | x 0dec01379d3b | 1008 | | x 0dec01379d3b |
| 1004 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 | 1009 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 |
| 1005 | | | 1010 | | |
| 1006 | x 471f378eab4c | 1011 | x 471f378eab4c |
| 1007 |/ Obsfate: folded using fold as 4:eb5a0daa2192 | 1012 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
| 1008 | | 1013 | |
| 1009 o ea207398892e | 1014 o ea207398892e |
| 1010 | 1015 |
| 1011 | 1016 |
| 1012 Test template with pushed and pulled obs markers | 1017 Test template with pushed and pulled obs markers |
| 1072 adding manifests | 1077 adding manifests |
| 1073 adding file changes | 1078 adding file changes |
| 1074 added 1 changesets with 0 changes to 1 files (+1 heads) | 1079 added 1 changesets with 0 changes to 1 files (+1 heads) |
| 1075 2 new obsolescence markers | 1080 2 new obsolescence markers |
| 1076 obsoleted 1 changesets | 1081 obsoleted 1 changesets |
| 1077 new changesets 7a230b46bf61 (1 drafts) | 1082 new changesets 7a230b46bf61 |
| 1078 (run 'hg heads' to see heads, 'hg merge' to merge) | 1083 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 1079 working directory parent is obsolete! (471f378eab4c) | 1084 working directory parent is obsolete! (471f378eab4c) |
| 1080 (use 'hg evolve' to update to its successor: 7a230b46bf61) | 1085 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
| 1081 $ hg log --hidden -G | 1086 $ hg log --hidden -G |
| 1082 o changeset: 2:7a230b46bf61 | 1087 o changeset: 2:7a230b46bf61 |
| 1719 $ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold | 1724 $ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold |
| 1720 2 changesets pruned | 1725 2 changesets pruned |
| 1721 $ hg prune -r 'desc(C)' -s 'desc(Z)' | 1726 $ hg prune -r 'desc(C)' -s 'desc(Z)' |
| 1722 1 changesets pruned | 1727 1 changesets pruned |
| 1723 $ hg debugobsolete | 1728 $ hg debugobsolete |
| 1724 944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'fold-id': 'c59cbeaa', 'fold-idx': '1', 'fold-size': '2', 'operation': 'prune', 'user': 'test'} | 1729 944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
| 1725 36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'fold-id': 'c59cbeaa', 'fold-idx': '2', 'fold-size': '2', 'operation': 'prune', 'user': 'test'} | 1730 36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
| 1726 5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} | 1731 5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
| 1727 $ hg tlog | 1732 $ hg tlog |
| 1728 o 4568aafd15c0 | 1733 o 4568aafd15c0 |
| 1729 | | 1734 | |
| 1730 @ 7ca5bfdbe243 | 1735 @ 7ca5bfdbe243 |
| 1731 | 1736 |
| 1732 $ hg tlog --hidden | 1737 $ hg tlog --hidden |
| 1733 o 4568aafd15c0 | 1738 o 4568aafd15c0 |
| 1734 | Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1 | 1739 | Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1 |
| 1735 | semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1 | 1740 | semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1 |
| 1736 | Origin: folded using prune from 1:944ade52b6a1, 2:36ca49338d3a | 1741 | Origin: rewritten using prune from 2:36ca49338d3a |
| 1737 | Origin: rewritten using prune from 3:5b3370228fe5 | 1742 | Origin: rewritten using prune from 3:5b3370228fe5 |
| 1743 | Origin: rewritten using prune from 1:944ade52b6a1 | |
| 1738 | | 1744 | |
| 1739 | x 5b3370228fe5 | 1745 | x 5b3370228fe5 |
| 1740 |/ Successors: 4:4568aafd15c0 | 1746 |/ Successors: 4:4568aafd15c0 |
| 1741 | semi-colon: 4:4568aafd15c0 | 1747 | semi-colon: 4:4568aafd15c0 |
| 1742 | Fate: rewritten using prune as 4:4568aafd15c0 | 1748 | Fate: rewritten using prune as 4:4568aafd15c0 |
| 1743 | | 1749 | |
| 1744 | x 36ca49338d3a | 1750 | x 36ca49338d3a |
| 1745 | | Successors: 4:4568aafd15c0 | 1751 | | Successors: 4:4568aafd15c0 |
| 1746 | | semi-colon: 4:4568aafd15c0 | 1752 | | semi-colon: 4:4568aafd15c0 |
| 1747 | | Fate: folded using prune as 4:4568aafd15c0 | 1753 | | Fate: rewritten using prune as 4:4568aafd15c0 |
| 1748 | | | 1754 | | |
| 1749 | x 944ade52b6a1 | 1755 | x 944ade52b6a1 |
| 1750 |/ Successors: 4:4568aafd15c0 | 1756 |/ Successors: 4:4568aafd15c0 |
| 1751 | semi-colon: 4:4568aafd15c0 | 1757 | semi-colon: 4:4568aafd15c0 |
| 1752 | Fate: folded using prune as 4:4568aafd15c0 | 1758 | Fate: rewritten using prune as 4:4568aafd15c0 |
| 1753 | | 1759 | |
| 1754 @ 7ca5bfdbe243 | 1760 @ 7ca5bfdbe243 |
| 1755 | 1761 |