445 | summary: C0 |
445 | summary: C0 |
446 | |
446 | |
447 | x changeset: 2:0dec01379d3b |
447 | x changeset: 2:0dec01379d3b |
448 | | user: test |
448 | | user: test |
449 | | date: Thu Jan 01 00:00:00 1970 +0000 |
449 | | date: Thu Jan 01 00:00:00 1970 +0000 |
450 | | obsolete: folded using fold as 3:eb5a0daa2192 |
450 | | obsolete: rewritten using fold as 3:eb5a0daa2192 |
451 | | summary: B0 |
451 | | summary: B0 |
452 | | |
452 | | |
453 | x changeset: 1:471f378eab4c |
453 | x changeset: 1:471f378eab4c |
454 |/ user: test |
454 |/ user: test |
455 | date: Thu Jan 01 00:00:00 1970 +0000 |
455 | date: Thu Jan 01 00:00:00 1970 +0000 |
456 | obsolete: folded using fold as 3:eb5a0daa2192 |
456 | obsolete: rewritten using fold as 3:eb5a0daa2192 |
457 | summary: A0 |
457 | summary: A0 |
458 | |
458 | |
459 o changeset: 0:ea207398892e |
459 o changeset: 0:ea207398892e |
460 user: test |
460 user: test |
461 date: Thu Jan 01 00:00:00 1970 +0000 |
461 date: Thu Jan 01 00:00:00 1970 +0000 |
477 | Predecessors: 1:471f378eab4c |
477 | Predecessors: 1:471f378eab4c |
478 | semi-colon: 1:471f378eab4c |
478 | semi-colon: 1:471f378eab4c |
479 | @ 471f378eab4c |
479 | @ 471f378eab4c |
480 |/ Successors: 3:eb5a0daa2192 |
480 |/ Successors: 3:eb5a0daa2192 |
481 | semi-colon: 3:eb5a0daa2192 |
481 | semi-colon: 3:eb5a0daa2192 |
482 | Fate: folded using fold as 3:eb5a0daa2192 |
482 | Fate: rewritten using fold as 3:eb5a0daa2192 |
483 | |
483 | |
484 o ea207398892e |
484 o ea207398892e |
485 |
485 |
486 $ hg fatelog |
486 $ hg fatelog |
487 o eb5a0daa2192 |
487 o eb5a0daa2192 |
488 | |
488 | |
489 | @ 471f378eab4c |
489 | @ 471f378eab4c |
490 |/ Obsfate: folded using fold as 3:eb5a0daa2192 |
490 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
491 | |
491 | |
492 o ea207398892e |
492 o ea207398892e |
493 |
493 |
494 $ hg up 'desc(B0)' --hidden |
494 $ hg up 'desc(B0)' --hidden |
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
505 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
505 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
506 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
506 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
507 | @ 0dec01379d3b |
507 | @ 0dec01379d3b |
508 | | Successors: 3:eb5a0daa2192 |
508 | | Successors: 3:eb5a0daa2192 |
509 | | semi-colon: 3:eb5a0daa2192 |
509 | | semi-colon: 3:eb5a0daa2192 |
510 | | Fate: folded using fold as 3:eb5a0daa2192 |
510 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
511 | | |
511 | | |
512 | x 471f378eab4c |
512 | x 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 fatelog |
519 $ hg fatelog |
520 o eb5a0daa2192 |
520 o eb5a0daa2192 |
521 | |
521 | |
522 | @ 0dec01379d3b |
522 | @ 0dec01379d3b |
523 | | Obsfate: folded using fold as 3:eb5a0daa2192 |
523 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
524 | | |
524 | | |
525 | x 471f378eab4c |
525 | x 471f378eab4c |
526 |/ Obsfate: folded using fold as 3:eb5a0daa2192 |
526 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
527 | |
527 | |
528 o ea207398892e |
528 o ea207398892e |
529 |
529 |
530 |
530 |
531 $ hg up 'desc(C0)' |
531 $ hg up 'desc(C0)' |
545 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
545 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
546 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
546 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
547 | x 0dec01379d3b |
547 | x 0dec01379d3b |
548 | | Successors: 3:eb5a0daa2192 |
548 | | Successors: 3:eb5a0daa2192 |
549 | | semi-colon: 3:eb5a0daa2192 |
549 | | semi-colon: 3:eb5a0daa2192 |
550 | | Fate: folded using fold as 3:eb5a0daa2192 |
550 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
551 | | |
551 | | |
552 | x 471f378eab4c |
552 | x 471f378eab4c |
553 |/ Successors: 3:eb5a0daa2192 |
553 |/ Successors: 3:eb5a0daa2192 |
554 | semi-colon: 3:eb5a0daa2192 |
554 | semi-colon: 3:eb5a0daa2192 |
555 | Fate: folded using fold as 3:eb5a0daa2192 |
555 | Fate: rewritten using fold as 3:eb5a0daa2192 |
556 | |
556 | |
557 o ea207398892e |
557 o ea207398892e |
558 |
558 |
559 $ hg fatelog --hidden |
559 $ hg fatelog --hidden |
560 @ eb5a0daa2192 |
560 @ eb5a0daa2192 |
561 | |
561 | |
562 | x 0dec01379d3b |
562 | x 0dec01379d3b |
563 | | Obsfate: folded using fold as 3:eb5a0daa2192 |
563 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
564 | | |
564 | | |
565 | x 471f378eab4c |
565 | x 471f378eab4c |
566 |/ Obsfate: folded using fold as 3:eb5a0daa2192 |
566 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
567 | |
567 | |
568 o ea207398892e |
568 o ea207398892e |
569 |
569 |
570 |
570 |
571 Test templates with divergence |
571 Test templates with divergence |
778 | |
778 | |
779 | x changeset: 3:b7ea6d14e664 |
779 | x changeset: 3:b7ea6d14e664 |
780 | | parent: 1:471f378eab4c |
780 | | parent: 1:471f378eab4c |
781 | | user: test |
781 | | user: test |
782 | | date: Thu Jan 01 00:00:00 1970 +0000 |
782 | | date: Thu Jan 01 00:00:00 1970 +0000 |
783 | | obsolete: folded using fold as 4:eb5a0daa2192 |
783 | | obsolete: rewritten using fold as 4:eb5a0daa2192 |
784 | | summary: B1 |
784 | | summary: B1 |
785 | | |
785 | | |
786 | | x changeset: 2:0dec01379d3b |
786 | | x changeset: 2:0dec01379d3b |
787 | |/ user: test |
787 | |/ user: test |
788 | | date: Thu Jan 01 00:00:00 1970 +0000 |
788 | | date: Thu Jan 01 00:00:00 1970 +0000 |
790 | | summary: B0 |
790 | | summary: B0 |
791 | | |
791 | | |
792 | x changeset: 1:471f378eab4c |
792 | x changeset: 1:471f378eab4c |
793 |/ user: test |
793 |/ user: test |
794 | date: Thu Jan 01 00:00:00 1970 +0000 |
794 | date: Thu Jan 01 00:00:00 1970 +0000 |
795 | obsolete: folded using fold as 4:eb5a0daa2192 |
795 | obsolete: rewritten using fold as 4:eb5a0daa2192 |
796 | summary: A0 |
796 | summary: A0 |
797 | |
797 | |
798 o changeset: 0:ea207398892e |
798 o changeset: 0:ea207398892e |
799 user: test |
799 user: test |
800 date: Thu Jan 01 00:00:00 1970 +0000 |
800 date: Thu Jan 01 00:00:00 1970 +0000 |
814 | Predecessors: 1:471f378eab4c |
814 | Predecessors: 1:471f378eab4c |
815 | semi-colon: 1:471f378eab4c |
815 | semi-colon: 1:471f378eab4c |
816 | @ 471f378eab4c |
816 | @ 471f378eab4c |
817 |/ Successors: 4:eb5a0daa2192 |
817 |/ Successors: 4:eb5a0daa2192 |
818 | semi-colon: 4:eb5a0daa2192 |
818 | semi-colon: 4:eb5a0daa2192 |
819 | Fate: folded using fold as 4:eb5a0daa2192 |
819 | Fate: rewritten using fold as 4:eb5a0daa2192 |
820 | |
820 | |
821 o ea207398892e |
821 o ea207398892e |
822 |
822 |
823 $ hg fatelog |
823 $ hg fatelog |
824 o eb5a0daa2192 |
824 o eb5a0daa2192 |
825 | |
825 | |
826 | @ 471f378eab4c |
826 | @ 471f378eab4c |
827 |/ Obsfate: folded using fold as 4:eb5a0daa2192 |
827 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
828 | |
828 | |
829 o ea207398892e |
829 o ea207398892e |
830 |
830 |
831 $ hg up 'desc(B0)' --hidden |
831 $ hg up 'desc(B0)' --hidden |
832 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
832 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
844 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 |
844 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 |
845 | | |
845 | | |
846 | x 471f378eab4c |
846 | x 471f378eab4c |
847 |/ Successors: 4:eb5a0daa2192 |
847 |/ Successors: 4:eb5a0daa2192 |
848 | semi-colon: 4:eb5a0daa2192 |
848 | semi-colon: 4:eb5a0daa2192 |
849 | Fate: folded using fold as 4:eb5a0daa2192 |
849 | Fate: rewritten using fold as 4:eb5a0daa2192 |
850 | |
850 | |
851 o ea207398892e |
851 o ea207398892e |
852 |
852 |
853 $ hg fatelog |
853 $ hg fatelog |
854 o eb5a0daa2192 |
854 o eb5a0daa2192 |
855 | |
855 | |
856 | @ 0dec01379d3b |
856 | @ 0dec01379d3b |
857 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 |
857 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 |
858 | | |
858 | | |
859 | x 471f378eab4c |
859 | x 471f378eab4c |
860 |/ Obsfate: folded using fold as 4:eb5a0daa2192 |
860 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
861 | |
861 | |
862 o ea207398892e |
862 o ea207398892e |
863 |
863 |
864 |
864 |
865 $ hg up 'desc(B1)' --hidden |
865 $ hg up 'desc(B1)' --hidden |
873 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
873 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
874 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
874 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
875 | @ b7ea6d14e664 |
875 | @ b7ea6d14e664 |
876 | | Successors: 4:eb5a0daa2192 |
876 | | Successors: 4:eb5a0daa2192 |
877 | | semi-colon: 4:eb5a0daa2192 |
877 | | semi-colon: 4:eb5a0daa2192 |
878 | | Fate: folded using fold as 4:eb5a0daa2192 |
878 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
879 | | |
879 | | |
880 | x 471f378eab4c |
880 | x 471f378eab4c |
881 |/ Successors: 4:eb5a0daa2192 |
881 |/ Successors: 4:eb5a0daa2192 |
882 | semi-colon: 4:eb5a0daa2192 |
882 | semi-colon: 4:eb5a0daa2192 |
883 | Fate: folded using fold as 4:eb5a0daa2192 |
883 | Fate: rewritten using fold as 4:eb5a0daa2192 |
884 | |
884 | |
885 o ea207398892e |
885 o ea207398892e |
886 |
886 |
887 $ hg fatelog |
887 $ hg fatelog |
888 o eb5a0daa2192 |
888 o eb5a0daa2192 |
889 | |
889 | |
890 | @ b7ea6d14e664 |
890 | @ b7ea6d14e664 |
891 | | Obsfate: folded using fold as 4:eb5a0daa2192 |
891 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
892 | | |
892 | | |
893 | x 471f378eab4c |
893 | x 471f378eab4c |
894 |/ Obsfate: folded using fold as 4:eb5a0daa2192 |
894 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
895 | |
895 | |
896 o ea207398892e |
896 o ea207398892e |
897 |
897 |
898 |
898 |
899 $ hg up 'desc(C0)' |
899 $ hg up 'desc(C0)' |
910 | x b7ea6d14e664 |
910 | x b7ea6d14e664 |
911 | | Predecessors: 2:0dec01379d3b |
911 | | Predecessors: 2:0dec01379d3b |
912 | | semi-colon: 2:0dec01379d3b |
912 | | semi-colon: 2:0dec01379d3b |
913 | | Successors: 4:eb5a0daa2192 |
913 | | Successors: 4:eb5a0daa2192 |
914 | | semi-colon: 4:eb5a0daa2192 |
914 | | semi-colon: 4:eb5a0daa2192 |
915 | | Fate: folded using fold as 4:eb5a0daa2192 |
915 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
916 | | |
916 | | |
917 | | x 0dec01379d3b |
917 | | x 0dec01379d3b |
918 | |/ Successors: 3:b7ea6d14e664 |
918 | |/ Successors: 3:b7ea6d14e664 |
919 | | semi-colon: 3:b7ea6d14e664 |
919 | | semi-colon: 3:b7ea6d14e664 |
920 | | Fate: reworded using amend as 3:b7ea6d14e664 |
920 | | Fate: reworded using amend as 3:b7ea6d14e664 |
921 | | |
921 | | |
922 | x 471f378eab4c |
922 | x 471f378eab4c |
923 |/ Successors: 4:eb5a0daa2192 |
923 |/ Successors: 4:eb5a0daa2192 |
924 | semi-colon: 4:eb5a0daa2192 |
924 | semi-colon: 4:eb5a0daa2192 |
925 | Fate: folded using fold as 4:eb5a0daa2192 |
925 | Fate: rewritten using fold as 4:eb5a0daa2192 |
926 | |
926 | |
927 o ea207398892e |
927 o ea207398892e |
928 |
928 |
929 $ hg fatelog --hidden |
929 $ hg fatelog --hidden |
930 @ eb5a0daa2192 |
930 @ eb5a0daa2192 |
931 | |
931 | |
932 | x b7ea6d14e664 |
932 | x b7ea6d14e664 |
933 | | Obsfate: folded using fold as 4:eb5a0daa2192 |
933 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
934 | | |
934 | | |
935 | | x 0dec01379d3b |
935 | | x 0dec01379d3b |
936 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 |
936 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 |
937 | | |
937 | | |
938 | x 471f378eab4c |
938 | x 471f378eab4c |
939 |/ Obsfate: folded using fold as 4:eb5a0daa2192 |
939 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
940 | |
940 | |
941 o ea207398892e |
941 o ea207398892e |
942 |
942 |
943 |
943 |
944 Test template with pushed and pulled obs markers |
944 Test template with pushed and pulled obs markers |
1004 adding manifests |
1004 adding manifests |
1005 adding file changes |
1005 adding file changes |
1006 added 1 changesets with 0 changes to 1 files (+1 heads) |
1006 added 1 changesets with 0 changes to 1 files (+1 heads) |
1007 2 new obsolescence markers |
1007 2 new obsolescence markers |
1008 obsoleted 1 changesets |
1008 obsoleted 1 changesets |
1009 new changesets 7a230b46bf61 (1 drafts) |
1009 new changesets 7a230b46bf61 |
1010 (run 'hg heads' to see heads, 'hg merge' to merge) |
1010 (run 'hg heads' to see heads, 'hg merge' to merge) |
1011 working directory parent is obsolete! (471f378eab4c) |
1011 working directory parent is obsolete! (471f378eab4c) |
1012 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1012 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1013 $ hg log --hidden -G |
1013 $ hg log --hidden -G |
1014 o changeset: 2:7a230b46bf61 |
1014 o changeset: 2:7a230b46bf61 |