Show More
@@ -460,6 +460,7 b' Write the python script to disk' | |||
|
460 | 460 | > } |
|
461 | 461 | > # untracked-X is a version of X where the file is not tracked (? unknown) |
|
462 | 462 | > wccontent['untracked-clean'] = wccontent['clean'] |
|
463 | > wccontent['untracked-revert'] = wccontent['revert'] | |
|
463 | 464 | > |
|
464 | 465 | > # build the combination of possible states |
|
465 | 466 | > combination = [] |
@@ -507,26 +508,31 b' check list of planned files' | |||
|
507 | 508 | added_removed |
|
508 | 509 | added_revert |
|
509 | 510 | added_untracked-clean |
|
511 | added_untracked-revert | |
|
510 | 512 | added_wc |
|
511 | 513 | clean_clean |
|
512 | 514 | clean_removed |
|
513 | 515 | clean_revert |
|
514 | 516 | clean_untracked-clean |
|
517 | clean_untracked-revert | |
|
515 | 518 | clean_wc |
|
516 | 519 | missing_clean |
|
517 | 520 | missing_removed |
|
518 | 521 | missing_revert |
|
519 | 522 | missing_untracked-clean |
|
523 | missing_untracked-revert | |
|
520 | 524 | missing_wc |
|
521 | 525 | modified_clean |
|
522 | 526 | modified_removed |
|
523 | 527 | modified_revert |
|
524 | 528 | modified_untracked-clean |
|
529 | modified_untracked-revert | |
|
525 | 530 | modified_wc |
|
526 | 531 | removed_clean |
|
527 | 532 | removed_removed |
|
528 | 533 | removed_revert |
|
529 | 534 | removed_untracked-clean |
|
535 | removed_untracked-revert | |
|
530 | 536 | removed_wc |
|
531 | 537 | |
|
532 | 538 | Script to make a simple text version of the content |
@@ -558,32 +564,38 b' Generate base changeset' | |||
|
558 | 564 | adding clean_removed |
|
559 | 565 | adding clean_revert |
|
560 | 566 | adding clean_untracked-clean |
|
567 | adding clean_untracked-revert | |
|
561 | 568 | adding clean_wc |
|
562 | 569 | adding modified_clean |
|
563 | 570 | adding modified_removed |
|
564 | 571 | adding modified_revert |
|
565 | 572 | adding modified_untracked-clean |
|
573 | adding modified_untracked-revert | |
|
566 | 574 | adding modified_wc |
|
567 | 575 | adding removed_clean |
|
568 | 576 | adding removed_removed |
|
569 | 577 | adding removed_revert |
|
570 | 578 | adding removed_untracked-clean |
|
579 | adding removed_untracked-revert | |
|
571 | 580 | adding removed_wc |
|
572 | 581 | $ hg status |
|
573 | 582 | A clean_clean |
|
574 | 583 | A clean_removed |
|
575 | 584 | A clean_revert |
|
576 | 585 | A clean_untracked-clean |
|
586 | A clean_untracked-revert | |
|
577 | 587 | A clean_wc |
|
578 | 588 | A modified_clean |
|
579 | 589 | A modified_removed |
|
580 | 590 | A modified_revert |
|
581 | 591 | A modified_untracked-clean |
|
592 | A modified_untracked-revert | |
|
582 | 593 | A modified_wc |
|
583 | 594 | A removed_clean |
|
584 | 595 | A removed_removed |
|
585 | 596 | A removed_revert |
|
586 | 597 | A removed_untracked-clean |
|
598 | A removed_untracked-revert | |
|
587 | 599 | A removed_wc |
|
588 | 600 | $ hg commit -m 'base' |
|
589 | 601 | |
@@ -595,16 +607,19 b' Generate base changeset' | |||
|
595 | 607 | base clean_removed |
|
596 | 608 | base clean_revert |
|
597 | 609 | base clean_untracked-clean |
|
610 | base clean_untracked-revert | |
|
598 | 611 | base clean_wc |
|
599 | 612 | base modified_clean |
|
600 | 613 | base modified_removed |
|
601 | 614 | base modified_revert |
|
602 | 615 | base modified_untracked-clean |
|
616 | base modified_untracked-revert | |
|
603 | 617 | base modified_wc |
|
604 | 618 | base removed_clean |
|
605 | 619 | base removed_removed |
|
606 | 620 | base removed_revert |
|
607 | 621 | base removed_untracked-clean |
|
622 | base removed_untracked-revert | |
|
608 | 623 | base removed_wc |
|
609 | 624 | |
|
610 | 625 | Create parent changeset |
@@ -615,27 +630,32 b' Create parent changeset' | |||
|
615 | 630 | adding added_removed |
|
616 | 631 | adding added_revert |
|
617 | 632 | adding added_untracked-clean |
|
633 | adding added_untracked-revert | |
|
618 | 634 | adding added_wc |
|
619 | 635 | removing removed_clean |
|
620 | 636 | removing removed_removed |
|
621 | 637 | removing removed_revert |
|
622 | 638 | removing removed_untracked-clean |
|
639 | removing removed_untracked-revert | |
|
623 | 640 | removing removed_wc |
|
624 | 641 | $ hg status |
|
625 | 642 | M modified_clean |
|
626 | 643 | M modified_removed |
|
627 | 644 | M modified_revert |
|
628 | 645 | M modified_untracked-clean |
|
646 | M modified_untracked-revert | |
|
629 | 647 | M modified_wc |
|
630 | 648 | A added_clean |
|
631 | 649 | A added_removed |
|
632 | 650 | A added_revert |
|
633 | 651 | A added_untracked-clean |
|
652 | A added_untracked-revert | |
|
634 | 653 | A added_wc |
|
635 | 654 | R removed_clean |
|
636 | 655 | R removed_removed |
|
637 | 656 | R removed_revert |
|
638 | 657 | R removed_untracked-clean |
|
658 | R removed_untracked-revert | |
|
639 | 659 | R removed_wc |
|
640 | 660 | $ hg commit -m 'parent' |
|
641 | 661 | |
@@ -647,16 +667,19 b' Create parent changeset' | |||
|
647 | 667 | parent added_removed |
|
648 | 668 | parent added_revert |
|
649 | 669 | parent added_untracked-clean |
|
670 | parent added_untracked-revert | |
|
650 | 671 | parent added_wc |
|
651 | 672 | base clean_clean |
|
652 | 673 | base clean_removed |
|
653 | 674 | base clean_revert |
|
654 | 675 | base clean_untracked-clean |
|
676 | base clean_untracked-revert | |
|
655 | 677 | base clean_wc |
|
656 | 678 | parent modified_clean |
|
657 | 679 | parent modified_removed |
|
658 | 680 | parent modified_revert |
|
659 | 681 | parent modified_untracked-clean |
|
682 | parent modified_untracked-revert | |
|
660 | 683 | parent modified_wc |
|
661 | 684 | |
|
662 | 685 | Setup working directory |
@@ -665,10 +688,12 b' Setup working directory' | |||
|
665 | 688 | $ hg addremove --similarity 0 |
|
666 | 689 | removing added_removed |
|
667 | 690 | removing added_revert |
|
691 | removing added_untracked-revert | |
|
668 | 692 | removing clean_removed |
|
669 | 693 | adding missing_wc |
|
670 | 694 | removing modified_removed |
|
671 | 695 | adding removed_revert |
|
696 | adding removed_untracked-revert | |
|
672 | 697 | adding removed_wc |
|
673 | 698 | $ hg forget *untracked* |
|
674 | 699 | $ hg status |
@@ -682,10 +707,14 b' Setup working directory' | |||
|
682 | 707 | R added_removed |
|
683 | 708 | R added_revert |
|
684 | 709 | R added_untracked-clean |
|
710 | R added_untracked-revert | |
|
685 | 711 | R clean_removed |
|
686 | 712 | R clean_untracked-clean |
|
713 | R clean_untracked-revert | |
|
687 | 714 | R modified_removed |
|
688 | 715 | R modified_untracked-clean |
|
716 | R modified_untracked-revert | |
|
717 | ? removed_untracked-revert | |
|
689 | 718 | |
|
690 | 719 | $ hg status --rev 'desc("base")' |
|
691 | 720 | M clean_wc |
@@ -697,11 +726,14 b' Setup working directory' | |||
|
697 | 726 | A missing_wc |
|
698 | 727 | R clean_removed |
|
699 | 728 | R clean_untracked-clean |
|
729 | R clean_untracked-revert | |
|
700 | 730 | R modified_removed |
|
701 | 731 | R modified_untracked-clean |
|
732 | R modified_untracked-revert | |
|
702 | 733 | R removed_clean |
|
703 | 734 | R removed_removed |
|
704 | 735 | R removed_untracked-clean |
|
736 | R removed_untracked-revert | |
|
705 | 737 | |
|
706 | 738 | (create a simple text version of the content) |
|
707 | 739 | |
@@ -713,13 +745,16 b' Setup working directory' | |||
|
713 | 745 | base clean_clean |
|
714 | 746 | base clean_revert |
|
715 | 747 | base clean_untracked-clean |
|
748 | base clean_untracked-revert | |
|
716 | 749 | wc clean_wc |
|
717 | 750 | wc missing_wc |
|
718 | 751 | parent modified_clean |
|
719 | 752 | base modified_revert |
|
720 | 753 | parent modified_untracked-clean |
|
754 | base modified_untracked-revert | |
|
721 | 755 | wc modified_wc |
|
722 | 756 | base removed_revert |
|
757 | base removed_untracked-revert | |
|
723 | 758 | wc removed_wc |
|
724 | 759 | |
|
725 | 760 | $ cd .. |
@@ -738,14 +773,17 b' check revert output' | |||
|
738 | 773 | undeleting added_removed |
|
739 | 774 | undeleting added_revert |
|
740 | 775 | undeleting added_untracked-clean |
|
776 | undeleting added_untracked-revert | |
|
741 | 777 | reverting added_wc |
|
742 | 778 | undeleting clean_removed |
|
743 | 779 | undeleting clean_untracked-clean |
|
780 | undeleting clean_untracked-revert | |
|
744 | 781 | reverting clean_wc |
|
745 | 782 | forgetting missing_wc |
|
746 | 783 | undeleting modified_removed |
|
747 | 784 | reverting modified_revert |
|
748 | 785 | undeleting modified_untracked-clean |
|
786 | undeleting modified_untracked-revert | |
|
749 | 787 | reverting modified_wc |
|
750 | 788 | forgetting removed_revert |
|
751 | 789 | forgetting removed_wc |
@@ -762,8 +800,10 b' additional `.orig` backup file when appl' | |||
|
762 | 800 | +wc clean_wc.orig |
|
763 | 801 | +wc missing_wc |
|
764 | 802 | +base modified_revert.orig |
|
803 | +base modified_untracked-revert.orig | |
|
765 | 804 | +wc modified_wc.orig |
|
766 | 805 | +base removed_revert |
|
806 | +base removed_untracked-revert | |
|
767 | 807 | +wc removed_wc |
|
768 | 808 | |
|
769 | 809 | Test revert --all to "base" content |
@@ -788,17 +828,20 b' Misbehavior:' | |||
|
788 | 828 | removing added_wc |
|
789 | 829 | undeleting clean_removed |
|
790 | 830 | undeleting clean_untracked-clean |
|
831 | undeleting clean_untracked-revert | |
|
791 | 832 | reverting clean_wc |
|
792 | 833 | forgetting missing_wc |
|
793 | 834 | reverting modified_clean |
|
794 | 835 | undeleting modified_removed |
|
795 | 836 | reverting modified_revert |
|
796 | 837 | undeleting modified_untracked-clean |
|
838 | undeleting modified_untracked-revert | |
|
797 | 839 | reverting modified_wc |
|
798 | 840 | adding removed_clean |
|
799 | 841 | adding removed_removed |
|
800 | 842 | reverting removed_revert |
|
801 | 843 | adding removed_untracked-clean |
|
844 | adding removed_untracked-revert | |
|
802 | 845 | reverting removed_wc |
|
803 | 846 | |
|
804 | 847 | Compare resulting directory with revert target. |
@@ -846,6 +889,8 b' revert all files individually and check ' | |||
|
846 | 889 | |
|
847 | 890 | ### revert for: added_untracked-clean |
|
848 | 891 | |
|
892 | ### revert for: added_untracked-revert | |
|
893 | ||
|
849 | 894 | ### revert for: added_wc |
|
850 | 895 | |
|
851 | 896 | ### revert for: clean_clean |
@@ -858,6 +903,8 b' revert all files individually and check ' | |||
|
858 | 903 | |
|
859 | 904 | ### revert for: clean_untracked-clean |
|
860 | 905 | |
|
906 | ### revert for: clean_untracked-revert | |
|
907 | ||
|
861 | 908 | ### revert for: clean_wc |
|
862 | 909 | |
|
863 | 910 | ### revert for: missing_clean |
@@ -872,6 +919,9 b' revert all files individually and check ' | |||
|
872 | 919 | ### revert for: missing_untracked-clean |
|
873 | 920 | missing_untracked-clean: no such file in rev * (glob) |
|
874 | 921 | |
|
922 | ### revert for: missing_untracked-revert | |
|
923 | missing_untracked-revert: no such file in rev * (glob) | |
|
924 | ||
|
875 | 925 | ### revert for: missing_wc |
|
876 | 926 | |
|
877 | 927 | ### revert for: modified_clean |
@@ -883,6 +933,8 b' revert all files individually and check ' | |||
|
883 | 933 | |
|
884 | 934 | ### revert for: modified_untracked-clean |
|
885 | 935 | |
|
936 | ### revert for: modified_untracked-revert | |
|
937 | ||
|
886 | 938 | ### revert for: modified_wc |
|
887 | 939 | |
|
888 | 940 | ### revert for: removed_clean |
@@ -896,6 +948,9 b' revert all files individually and check ' | |||
|
896 | 948 | ### revert for: removed_untracked-clean |
|
897 | 949 | removed_untracked-clean: no such file in rev * (glob) |
|
898 | 950 | |
|
951 | ### revert for: removed_untracked-revert | |
|
952 | file not managed: removed_untracked-revert | |
|
953 | ||
|
899 | 954 | ### revert for: removed_wc |
|
900 | 955 | |
|
901 | 956 | |
@@ -929,6 +984,7 b' Misbehavior:' | |||
|
929 | 984 | | - removed_revert |
|
930 | 985 | | - added_removed |
|
931 | 986 | | - added_untracked-clean |
|
987 | | - added_untracked-revert | |
|
932 | 988 | |
|
933 | 989 | $ for file in `python ../gen-revert-cases.py filelist`; do |
|
934 | 990 | > echo '### revert for:' $file; |
@@ -943,6 +999,8 b' Misbehavior:' | |||
|
943 | 999 | |
|
944 | 1000 | ### revert for: added_untracked-clean |
|
945 | 1001 | |
|
1002 | ### revert for: added_untracked-revert | |
|
1003 | ||
|
946 | 1004 | ### revert for: added_wc |
|
947 | 1005 | |
|
948 | 1006 | ### revert for: clean_clean |
@@ -953,6 +1011,8 b' Misbehavior:' | |||
|
953 | 1011 | |
|
954 | 1012 | ### revert for: clean_untracked-clean |
|
955 | 1013 | |
|
1014 | ### revert for: clean_untracked-revert | |
|
1015 | ||
|
956 | 1016 | ### revert for: clean_wc |
|
957 | 1017 | |
|
958 | 1018 | ### revert for: missing_clean |
@@ -967,6 +1027,9 b' Misbehavior:' | |||
|
967 | 1027 | ### revert for: missing_untracked-clean |
|
968 | 1028 | missing_untracked-clean: no such file in rev * (glob) |
|
969 | 1029 | |
|
1030 | ### revert for: missing_untracked-revert | |
|
1031 | missing_untracked-revert: no such file in rev * (glob) | |
|
1032 | ||
|
970 | 1033 | ### revert for: missing_wc |
|
971 | 1034 | |
|
972 | 1035 | ### revert for: modified_clean |
@@ -977,6 +1040,8 b' Misbehavior:' | |||
|
977 | 1040 | |
|
978 | 1041 | ### revert for: modified_untracked-clean |
|
979 | 1042 | |
|
1043 | ### revert for: modified_untracked-revert | |
|
1044 | ||
|
980 | 1045 | ### revert for: modified_wc |
|
981 | 1046 | |
|
982 | 1047 | ### revert for: removed_clean |
@@ -987,6 +1052,8 b' Misbehavior:' | |||
|
987 | 1052 | |
|
988 | 1053 | ### revert for: removed_untracked-clean |
|
989 | 1054 | |
|
1055 | ### revert for: removed_untracked-revert | |
|
1056 | ||
|
990 | 1057 | ### revert for: removed_wc |
|
991 | 1058 | |
|
992 | 1059 |
General Comments 0
You need to be logged in to leave comments.
Login now