Mercurial > evolve
comparison tests/test-evolve-templates.t @ 2612:fd35b428edfc
obsfate: by default only display the username if differ from the current one
This will will keep the output simple in the simple case.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 16 Jun 2017 18:38:04 +0200 |
parents | 45f5dbb24684 |
children | 3d432af2f6cd |
comparison
equal
deleted
inserted
replaced
2611:45f5dbb24684 | 2612:fd35b428edfc |
---|---|
344 | Precursors: 471597cad322 | 344 | Precursors: 471597cad322 |
345 | semi-colon: 471597cad322 | 345 | semi-colon: 471597cad322 |
346 | @ 471597cad322 | 346 | @ 471597cad322 |
347 |/ Successors: [337fec4d2edc, f257fde29c7a] | 347 |/ Successors: [337fec4d2edc, f257fde29c7a] |
348 | semi-colon: [337fec4d2edc, f257fde29c7a] | 348 | semi-colon: [337fec4d2edc, f257fde29c7a] |
349 | Fate: split by test as 337fec4d2edc, f257fde29c7a | 349 | Fate: split as 337fec4d2edc, f257fde29c7a |
350 | | 350 | |
351 o ea207398892e | 351 o ea207398892e |
352 | 352 |
353 $ hg fatelog | 353 $ hg fatelog |
354 o f257fde29c7a | 354 o f257fde29c7a |
355 | | 355 | |
356 o 337fec4d2edc | 356 o 337fec4d2edc |
357 | | 357 | |
358 | @ 471597cad322 | 358 | @ 471597cad322 |
359 |/ Obsfate: split by test as 337fec4d2edc, f257fde29c7a | 359 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
360 | | 360 | |
361 o ea207398892e | 361 o ea207398892e |
362 | 362 |
363 | 363 |
364 $ hg up f257fde29c7a | 364 $ hg up f257fde29c7a |
383 | Precursors: 471597cad322 | 383 | Precursors: 471597cad322 |
384 | semi-colon: 471597cad322 | 384 | semi-colon: 471597cad322 |
385 | x 471597cad322 | 385 | x 471597cad322 |
386 |/ Successors: [337fec4d2edc, f257fde29c7a] | 386 |/ Successors: [337fec4d2edc, f257fde29c7a] |
387 | semi-colon: [337fec4d2edc, f257fde29c7a] | 387 | semi-colon: [337fec4d2edc, f257fde29c7a] |
388 | Fate: split by test as 337fec4d2edc, f257fde29c7a | 388 | Fate: split as 337fec4d2edc, f257fde29c7a |
389 | | 389 | |
390 o ea207398892e | 390 o ea207398892e |
391 | 391 |
392 $ hg fatelog --hidden | 392 $ hg fatelog --hidden |
393 @ f257fde29c7a | 393 @ f257fde29c7a |
394 | | 394 | |
395 o 337fec4d2edc | 395 o 337fec4d2edc |
396 | | 396 | |
397 | x 471597cad322 | 397 | x 471597cad322 |
398 |/ Obsfate: split by test as 337fec4d2edc, f257fde29c7a | 398 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
399 | | 399 | |
400 o ea207398892e | 400 o ea207398892e |
401 | 401 |
402 | 402 |
403 $ hg fatelogjson --hidden | 403 $ hg fatelogjson --hidden |
478 | Precursors: 471f378eab4c | 478 | Precursors: 471f378eab4c |
479 | semi-colon: 471f378eab4c | 479 | semi-colon: 471f378eab4c |
480 | @ 471f378eab4c | 480 | @ 471f378eab4c |
481 |/ Successors: [eb5a0daa2192] | 481 |/ Successors: [eb5a0daa2192] |
482 | semi-colon: [eb5a0daa2192] | 482 | semi-colon: [eb5a0daa2192] |
483 | Fate: rewritten by test as eb5a0daa2192 | 483 | Fate: rewritten as eb5a0daa2192 |
484 | | 484 | |
485 o ea207398892e | 485 o ea207398892e |
486 | 486 |
487 $ hg fatelog | 487 $ hg fatelog |
488 o eb5a0daa2192 | 488 o eb5a0daa2192 |
489 | | 489 | |
490 | @ 471f378eab4c | 490 | @ 471f378eab4c |
491 |/ Obsfate: rewritten by test as eb5a0daa2192 | 491 |/ Obsfate: rewritten as eb5a0daa2192 |
492 | | 492 | |
493 o ea207398892e | 493 o ea207398892e |
494 | 494 |
495 $ hg up 'desc(B0)' --hidden | 495 $ hg up 'desc(B0)' --hidden |
496 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 496 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
504 | Precursors: 0dec01379d3b 471f378eab4c | 504 | Precursors: 0dec01379d3b 471f378eab4c |
505 | semi-colon: 0dec01379d3b; 471f378eab4c | 505 | semi-colon: 0dec01379d3b; 471f378eab4c |
506 | @ 0dec01379d3b | 506 | @ 0dec01379d3b |
507 | | Successors: [eb5a0daa2192] | 507 | | Successors: [eb5a0daa2192] |
508 | | semi-colon: [eb5a0daa2192] | 508 | | semi-colon: [eb5a0daa2192] |
509 | | Fate: rewritten by test as eb5a0daa2192 | 509 | | Fate: rewritten as eb5a0daa2192 |
510 | | | 510 | | |
511 | x 471f378eab4c | 511 | x 471f378eab4c |
512 |/ Successors: [eb5a0daa2192] | 512 |/ Successors: [eb5a0daa2192] |
513 | semi-colon: [eb5a0daa2192] | 513 | semi-colon: [eb5a0daa2192] |
514 | Fate: rewritten by test as eb5a0daa2192 | 514 | Fate: rewritten as eb5a0daa2192 |
515 | | 515 | |
516 o ea207398892e | 516 o ea207398892e |
517 | 517 |
518 $ hg fatelog | 518 $ hg fatelog |
519 o eb5a0daa2192 | 519 o eb5a0daa2192 |
520 | | 520 | |
521 | @ 0dec01379d3b | 521 | @ 0dec01379d3b |
522 | | Obsfate: rewritten by test as eb5a0daa2192 | 522 | | Obsfate: rewritten as eb5a0daa2192 |
523 | | | 523 | | |
524 | x 471f378eab4c | 524 | x 471f378eab4c |
525 |/ Obsfate: rewritten by test as eb5a0daa2192 | 525 |/ Obsfate: rewritten as eb5a0daa2192 |
526 | | 526 | |
527 o ea207398892e | 527 o ea207398892e |
528 | 528 |
529 | 529 |
530 $ hg up 'desc(C0)' | 530 $ hg up 'desc(C0)' |
544 | Precursors: 0dec01379d3b 471f378eab4c | 544 | Precursors: 0dec01379d3b 471f378eab4c |
545 | semi-colon: 0dec01379d3b; 471f378eab4c | 545 | semi-colon: 0dec01379d3b; 471f378eab4c |
546 | x 0dec01379d3b | 546 | x 0dec01379d3b |
547 | | Successors: [eb5a0daa2192] | 547 | | Successors: [eb5a0daa2192] |
548 | | semi-colon: [eb5a0daa2192] | 548 | | semi-colon: [eb5a0daa2192] |
549 | | Fate: rewritten by test as eb5a0daa2192 | 549 | | Fate: rewritten as eb5a0daa2192 |
550 | | | 550 | | |
551 | x 471f378eab4c | 551 | x 471f378eab4c |
552 |/ Successors: [eb5a0daa2192] | 552 |/ Successors: [eb5a0daa2192] |
553 | semi-colon: [eb5a0daa2192] | 553 | semi-colon: [eb5a0daa2192] |
554 | Fate: rewritten by test as eb5a0daa2192 | 554 | Fate: rewritten as eb5a0daa2192 |
555 | | 555 | |
556 o ea207398892e | 556 o ea207398892e |
557 | 557 |
558 $ hg fatelog --hidden | 558 $ hg fatelog --hidden |
559 @ eb5a0daa2192 | 559 @ eb5a0daa2192 |
560 | | 560 | |
561 | x 0dec01379d3b | 561 | x 0dec01379d3b |
562 | | Obsfate: rewritten by test as eb5a0daa2192 | 562 | | Obsfate: rewritten as eb5a0daa2192 |
563 | | | 563 | | |
564 | x 471f378eab4c | 564 | x 471f378eab4c |
565 |/ Obsfate: rewritten by test as eb5a0daa2192 | 565 |/ Obsfate: rewritten as eb5a0daa2192 |
566 | | 566 | |
567 o ea207398892e | 567 o ea207398892e |
568 | 568 |
569 | 569 |
570 $ hg fatelogjson --hidden | 570 $ hg fatelogjson --hidden |
657 |/ Precursors: 471f378eab4c | 657 |/ Precursors: 471f378eab4c |
658 | semi-colon: 471f378eab4c | 658 | semi-colon: 471f378eab4c |
659 | @ 471f378eab4c | 659 | @ 471f378eab4c |
660 |/ Successors: [fdf9bde5129a], [019fadeab383] | 660 |/ Successors: [fdf9bde5129a], [019fadeab383] |
661 | semi-colon: [fdf9bde5129a]; [019fadeab383] | 661 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
662 | Fate: rewritten by test as fdf9bde5129a | 662 | Fate: rewritten as fdf9bde5129a |
663 | rewritten by test as 019fadeab383 | 663 | rewritten as 019fadeab383 |
664 | | 664 | |
665 o ea207398892e | 665 o ea207398892e |
666 | 666 |
667 $ hg fatelog | 667 $ hg fatelog |
668 o 019fadeab383 | 668 o 019fadeab383 |
669 | | 669 | |
670 | o fdf9bde5129a | 670 | o fdf9bde5129a |
671 |/ | 671 |/ |
672 | @ 471f378eab4c | 672 | @ 471f378eab4c |
673 |/ Obsfate: rewritten by test as fdf9bde5129a | 673 |/ Obsfate: rewritten as fdf9bde5129a |
674 | rewritten by test as 019fadeab383 | 674 | rewritten as 019fadeab383 |
675 | | 675 | |
676 o ea207398892e | 676 o ea207398892e |
677 | 677 |
678 | 678 |
679 $ hg up 'desc(A1)' | 679 $ hg up 'desc(A1)' |
703 | x 65b757b745b9 | 703 | x 65b757b745b9 |
704 |/ Precursors: 471f378eab4c | 704 |/ Precursors: 471f378eab4c |
705 | semi-colon: 471f378eab4c | 705 | semi-colon: 471f378eab4c |
706 | Successors: [019fadeab383] | 706 | Successors: [019fadeab383] |
707 | semi-colon: [019fadeab383] | 707 | semi-colon: [019fadeab383] |
708 | Fate: rewritten by test as 019fadeab383 | 708 | Fate: rewritten as 019fadeab383 |
709 | | 709 | |
710 | @ fdf9bde5129a | 710 | @ fdf9bde5129a |
711 |/ Precursors: 471f378eab4c | 711 |/ Precursors: 471f378eab4c |
712 | semi-colon: 471f378eab4c | 712 | semi-colon: 471f378eab4c |
713 | x 471f378eab4c | 713 | x 471f378eab4c |
714 |/ Successors: [fdf9bde5129a], [65b757b745b9] | 714 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
715 | semi-colon: [fdf9bde5129a]; [65b757b745b9] | 715 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
716 | Fate: rewritten by test as fdf9bde5129a | 716 | Fate: rewritten as fdf9bde5129a |
717 | rewritten by test as 65b757b745b9 | 717 | rewritten as 65b757b745b9 |
718 | | 718 | |
719 o ea207398892e | 719 o ea207398892e |
720 | 720 |
721 $ hg fatelog --hidden | 721 $ hg fatelog --hidden |
722 o 019fadeab383 | 722 o 019fadeab383 |
723 | | 723 | |
724 | x 65b757b745b9 | 724 | x 65b757b745b9 |
725 |/ Obsfate: rewritten by test as 019fadeab383 | 725 |/ Obsfate: rewritten as 019fadeab383 |
726 | | 726 | |
727 | @ fdf9bde5129a | 727 | @ fdf9bde5129a |
728 |/ | 728 |/ |
729 | x 471f378eab4c | 729 | x 471f378eab4c |
730 |/ Obsfate: rewritten by test as fdf9bde5129a | 730 |/ Obsfate: rewritten as fdf9bde5129a |
731 | rewritten by test as 65b757b745b9 | 731 | rewritten as 65b757b745b9 |
732 | | 732 | |
733 o ea207398892e | 733 o ea207398892e |
734 | 734 |
735 | 735 |
736 $ hg fatelogjson --hidden | 736 $ hg fatelogjson --hidden |
824 | Precursors: 471f378eab4c | 824 | Precursors: 471f378eab4c |
825 | semi-colon: 471f378eab4c | 825 | semi-colon: 471f378eab4c |
826 | @ 471f378eab4c | 826 | @ 471f378eab4c |
827 |/ Successors: [eb5a0daa2192] | 827 |/ Successors: [eb5a0daa2192] |
828 | semi-colon: [eb5a0daa2192] | 828 | semi-colon: [eb5a0daa2192] |
829 | Fate: rewritten by test as eb5a0daa2192 | 829 | Fate: rewritten as eb5a0daa2192 |
830 | | 830 | |
831 o ea207398892e | 831 o ea207398892e |
832 | 832 |
833 $ hg fatelog | 833 $ hg fatelog |
834 o eb5a0daa2192 | 834 o eb5a0daa2192 |
835 | | 835 | |
836 | @ 471f378eab4c | 836 | @ 471f378eab4c |
837 |/ Obsfate: rewritten by test as eb5a0daa2192 | 837 |/ Obsfate: rewritten as eb5a0daa2192 |
838 | | 838 | |
839 o ea207398892e | 839 o ea207398892e |
840 | 840 |
841 $ hg up 'desc(B0)' --hidden | 841 $ hg up 'desc(B0)' --hidden |
842 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 842 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
847 | Precursors: 0dec01379d3b 471f378eab4c | 847 | Precursors: 0dec01379d3b 471f378eab4c |
848 | semi-colon: 0dec01379d3b; 471f378eab4c | 848 | semi-colon: 0dec01379d3b; 471f378eab4c |
849 | @ 0dec01379d3b | 849 | @ 0dec01379d3b |
850 | | Successors: [eb5a0daa2192] | 850 | | Successors: [eb5a0daa2192] |
851 | | semi-colon: [eb5a0daa2192] | 851 | | semi-colon: [eb5a0daa2192] |
852 | | Fate: rewritten by test as eb5a0daa2192 | 852 | | Fate: rewritten as eb5a0daa2192 |
853 | | | 853 | | |
854 | x 471f378eab4c | 854 | x 471f378eab4c |
855 |/ Successors: [eb5a0daa2192] | 855 |/ Successors: [eb5a0daa2192] |
856 | semi-colon: [eb5a0daa2192] | 856 | semi-colon: [eb5a0daa2192] |
857 | Fate: rewritten by test as eb5a0daa2192 | 857 | Fate: rewritten as eb5a0daa2192 |
858 | | 858 | |
859 o ea207398892e | 859 o ea207398892e |
860 | 860 |
861 $ hg fatelog | 861 $ hg fatelog |
862 o eb5a0daa2192 | 862 o eb5a0daa2192 |
863 | | 863 | |
864 | @ 0dec01379d3b | 864 | @ 0dec01379d3b |
865 | | Obsfate: rewritten by test as eb5a0daa2192 | 865 | | Obsfate: rewritten as eb5a0daa2192 |
866 | | | 866 | | |
867 | x 471f378eab4c | 867 | x 471f378eab4c |
868 |/ Obsfate: rewritten by test as eb5a0daa2192 | 868 |/ Obsfate: rewritten as eb5a0daa2192 |
869 | | 869 | |
870 o ea207398892e | 870 o ea207398892e |
871 | 871 |
872 | 872 |
873 $ hg up 'desc(B1)' --hidden | 873 $ hg up 'desc(B1)' --hidden |
879 | Precursors: 471f378eab4c b7ea6d14e664 | 879 | Precursors: 471f378eab4c b7ea6d14e664 |
880 | semi-colon: 471f378eab4c; b7ea6d14e664 | 880 | semi-colon: 471f378eab4c; b7ea6d14e664 |
881 | @ b7ea6d14e664 | 881 | @ b7ea6d14e664 |
882 | | Successors: [eb5a0daa2192] | 882 | | Successors: [eb5a0daa2192] |
883 | | semi-colon: [eb5a0daa2192] | 883 | | semi-colon: [eb5a0daa2192] |
884 | | Fate: rewritten by test as eb5a0daa2192 | 884 | | Fate: rewritten as eb5a0daa2192 |
885 | | | 885 | | |
886 | x 471f378eab4c | 886 | x 471f378eab4c |
887 |/ Successors: [eb5a0daa2192] | 887 |/ Successors: [eb5a0daa2192] |
888 | semi-colon: [eb5a0daa2192] | 888 | semi-colon: [eb5a0daa2192] |
889 | Fate: rewritten by test as eb5a0daa2192 | 889 | Fate: rewritten as eb5a0daa2192 |
890 | | 890 | |
891 o ea207398892e | 891 o ea207398892e |
892 | 892 |
893 $ hg fatelog | 893 $ hg fatelog |
894 o eb5a0daa2192 | 894 o eb5a0daa2192 |
895 | | 895 | |
896 | @ b7ea6d14e664 | 896 | @ b7ea6d14e664 |
897 | | Obsfate: rewritten by test as eb5a0daa2192 | 897 | | Obsfate: rewritten as eb5a0daa2192 |
898 | | | 898 | | |
899 | x 471f378eab4c | 899 | x 471f378eab4c |
900 |/ Obsfate: rewritten by test as eb5a0daa2192 | 900 |/ Obsfate: rewritten as eb5a0daa2192 |
901 | | 901 | |
902 o ea207398892e | 902 o ea207398892e |
903 | 903 |
904 | 904 |
905 $ hg up 'desc(C0)' | 905 $ hg up 'desc(C0)' |
916 | x b7ea6d14e664 | 916 | x b7ea6d14e664 |
917 | | Precursors: 0dec01379d3b | 917 | | Precursors: 0dec01379d3b |
918 | | semi-colon: 0dec01379d3b | 918 | | semi-colon: 0dec01379d3b |
919 | | Successors: [eb5a0daa2192] | 919 | | Successors: [eb5a0daa2192] |
920 | | semi-colon: [eb5a0daa2192] | 920 | | semi-colon: [eb5a0daa2192] |
921 | | Fate: rewritten by test as eb5a0daa2192 | 921 | | Fate: rewritten as eb5a0daa2192 |
922 | | | 922 | | |
923 | | x 0dec01379d3b | 923 | | x 0dec01379d3b |
924 | |/ Successors: [b7ea6d14e664] | 924 | |/ Successors: [b7ea6d14e664] |
925 | | semi-colon: [b7ea6d14e664] | 925 | | semi-colon: [b7ea6d14e664] |
926 | | Fate: rewritten by test as b7ea6d14e664 | 926 | | Fate: rewritten as b7ea6d14e664 |
927 | | | 927 | | |
928 | x 471f378eab4c | 928 | x 471f378eab4c |
929 |/ Successors: [eb5a0daa2192] | 929 |/ Successors: [eb5a0daa2192] |
930 | semi-colon: [eb5a0daa2192] | 930 | semi-colon: [eb5a0daa2192] |
931 | Fate: rewritten by test as eb5a0daa2192 | 931 | Fate: rewritten as eb5a0daa2192 |
932 | | 932 | |
933 o ea207398892e | 933 o ea207398892e |
934 | 934 |
935 $ hg fatelog --hidden | 935 $ hg fatelog --hidden |
936 @ eb5a0daa2192 | 936 @ eb5a0daa2192 |
937 | | 937 | |
938 | x b7ea6d14e664 | 938 | x b7ea6d14e664 |
939 | | Obsfate: rewritten by test as eb5a0daa2192 | 939 | | Obsfate: rewritten as eb5a0daa2192 |
940 | | | 940 | | |
941 | | x 0dec01379d3b | 941 | | x 0dec01379d3b |
942 | |/ Obsfate: rewritten by test as b7ea6d14e664 | 942 | |/ Obsfate: rewritten as b7ea6d14e664 |
943 | | | 943 | | |
944 | x 471f378eab4c | 944 | x 471f378eab4c |
945 |/ Obsfate: rewritten by test as eb5a0daa2192 | 945 |/ Obsfate: rewritten as eb5a0daa2192 |
946 | | 946 | |
947 o ea207398892e | 947 o ea207398892e |
948 | 948 |
949 $ hg fatelogjson --hidden | 949 $ hg fatelogjson --hidden |
950 @ eb5a0daa2192 "" | 950 @ eb5a0daa2192 "" |
1049 | Precursors: 471f378eab4c | 1049 | Precursors: 471f378eab4c |
1050 | semi-colon: 471f378eab4c | 1050 | semi-colon: 471f378eab4c |
1051 | @ 471f378eab4c | 1051 | @ 471f378eab4c |
1052 |/ Successors: [7a230b46bf61] | 1052 |/ Successors: [7a230b46bf61] |
1053 | semi-colon: [7a230b46bf61] | 1053 | semi-colon: [7a230b46bf61] |
1054 | Fate: rewritten by test as 7a230b46bf61 | 1054 | Fate: rewritten as 7a230b46bf61 |
1055 | | 1055 | |
1056 o ea207398892e | 1056 o ea207398892e |
1057 | 1057 |
1058 $ hg fatelog --hidden -v | 1058 $ hg fatelog --hidden -v |
1059 o 7a230b46bf61 | 1059 o 7a230b46bf61 |
1080 | Precursors: 471f378eab4c | 1080 | Precursors: 471f378eab4c |
1081 | semi-colon: 471f378eab4c | 1081 | semi-colon: 471f378eab4c |
1082 | x 471f378eab4c | 1082 | x 471f378eab4c |
1083 |/ Successors: [7a230b46bf61] | 1083 |/ Successors: [7a230b46bf61] |
1084 | semi-colon: [7a230b46bf61] | 1084 | semi-colon: [7a230b46bf61] |
1085 | Fate: rewritten by test as 7a230b46bf61 | 1085 | Fate: rewritten as 7a230b46bf61 |
1086 | | 1086 | |
1087 o ea207398892e | 1087 o ea207398892e |
1088 | 1088 |
1089 $ hg fatelog --hidden -v | 1089 $ hg fatelog --hidden -v |
1090 @ 7a230b46bf61 | 1090 @ 7a230b46bf61 |
1125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1126 working directory parent is obsolete! (471f378eab4c) | 1126 working directory parent is obsolete! (471f378eab4c) |
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 @ 471f378eab4c | 1129 @ 471f378eab4c |
1130 | Fate: pruned by test | 1130 | Fate: pruned |
1131 | | 1131 | |
1132 o ea207398892e | 1132 o ea207398892e |
1133 | 1133 |
1134 $ hg fatelog -v | 1134 $ hg fatelog -v |
1135 @ 471f378eab4c | 1135 @ 471f378eab4c |