##// END OF EJS Templates
test-revert: removing a missing file has no effect...
Martin von Zweigbergk -
r23155:25e12d49 default
parent child Browse files
Show More
@@ -472,6 +472,8 Write the python script to disk
472 472 > continue
473 473 > if not ctxvalue[0] and 'revert' in wckey:
474 474 > continue
475 > if not ctxvalue[1] and ('removed' in wckey or 'deleted' in wckey):
476 > continue
475 477 > filename = "%s_%s" % (ctxkey, wckey)
476 478 > combination.append((filename, ctxkey, wckey))
477 479 >
@@ -523,8 +525,6 check list of planned files
523 525 clean_untracked-wc
524 526 clean_wc
525 527 missing_clean
526 missing_deleted
527 missing_removed
528 528 missing_untracked-clean
529 529 missing_untracked-wc
530 530 missing_wc
@@ -537,8 +537,6 check list of planned files
537 537 modified_untracked-wc
538 538 modified_wc
539 539 removed_clean
540 removed_deleted
541 removed_removed
542 540 removed_revert
543 541 removed_untracked-clean
544 542 removed_untracked-revert
@@ -585,8 +583,6 Generate base changeset
585 583 adding modified_untracked-wc
586 584 adding modified_wc
587 585 adding removed_clean
588 adding removed_deleted
589 adding removed_removed
590 586 adding removed_revert
591 587 adding removed_untracked-clean
592 588 adding removed_untracked-revert
@@ -608,8 +604,6 Generate base changeset
608 604 A modified_untracked-wc
609 605 A modified_wc
610 606 A removed_clean
611 A removed_deleted
612 A removed_removed
613 607 A removed_revert
614 608 A removed_untracked-clean
615 609 A removed_untracked-revert
@@ -636,8 +630,6 Generate base changeset
636 630 base modified_untracked-wc
637 631 base modified_wc
638 632 base removed_clean
639 base removed_deleted
640 base removed_removed
641 633 base removed_revert
642 634 base removed_untracked-clean
643 635 base removed_untracked-revert
@@ -655,8 +647,6 Create parent changeset
655 647 adding added_untracked-wc
656 648 adding added_wc
657 649 removing removed_clean
658 removing removed_deleted
659 removing removed_removed
660 650 removing removed_revert
661 651 removing removed_untracked-clean
662 652 removing removed_untracked-revert
@@ -678,8 +668,6 Create parent changeset
678 668 A added_untracked-wc
679 669 A added_wc
680 670 R removed_clean
681 R removed_deleted
682 R removed_removed
683 671 R removed_revert
684 672 R removed_untracked-clean
685 673 R removed_untracked-revert
@@ -718,11 +706,9 Setup working directory
718 706 $ hg addremove --similarity 0
719 707 removing added_removed
720 708 removing clean_removed
721 adding missing_deleted
722 709 adding missing_untracked-wc
723 710 adding missing_wc
724 711 removing modified_removed
725 adding removed_deleted
726 712 adding removed_revert
727 713 adding removed_untracked-revert
728 714 adding removed_untracked-wc
@@ -749,9 +735,7 Setup working directory
749 735 R modified_untracked-wc
750 736 ! added_deleted
751 737 ! clean_deleted
752 ! missing_deleted
753 738 ! modified_deleted
754 ! removed_deleted
755 739 ? missing_untracked-wc
756 740 ? removed_untracked-revert
757 741 ? removed_untracked-wc
@@ -772,16 +756,12 Setup working directory
772 756 R modified_untracked-revert
773 757 R modified_untracked-wc
774 758 R removed_clean
775 R removed_deleted
776 R removed_removed
777 759 R removed_untracked-clean
778 760 R removed_untracked-revert
779 761 R removed_untracked-wc
780 762 ! added_deleted
781 763 ! clean_deleted
782 ! missing_deleted
783 764 ! modified_deleted
784 ! removed_deleted
785 765 ? missing_untracked-wc
786 766
787 767 (create a simple text version of the content)
@@ -832,7 +812,6 check revert output
832 812 undeleting clean_untracked-clean
833 813 undeleting clean_untracked-wc
834 814 reverting clean_wc
835 forgetting missing_deleted
836 815 forgetting missing_wc
837 816 reverting modified_deleted
838 817 undeleting modified_removed
@@ -841,7 +820,6 check revert output
841 820 undeleting modified_untracked-revert
842 821 undeleting modified_untracked-wc
843 822 reverting modified_wc
844 forgetting removed_deleted
845 823 forgetting removed_revert
846 824 forgetting removed_wc
847 825
@@ -887,7 +865,6 check revert output
887 865 undeleting clean_untracked-clean
888 866 undeleting clean_untracked-wc
889 867 reverting clean_wc
890 forgetting missing_deleted
891 868 forgetting missing_wc
892 869 reverting modified_clean
893 870 reverting modified_deleted
@@ -897,8 +874,6 check revert output
897 874 undeleting modified_untracked-wc
898 875 reverting modified_wc
899 876 adding removed_clean
900 reverting removed_deleted
901 adding removed_removed
902 877 adding removed_untracked-clean
903 878 adding removed_untracked-revert
904 879 adding removed_untracked-wc
@@ -970,11 +945,6 revert all files individually and check
970 945 ### revert for: missing_clean
971 946 missing_clean: no such file in rev * (glob)
972 947
973 ### revert for: missing_deleted
974
975 ### revert for: missing_removed
976 missing_removed: no such file in rev * (glob)
977
978 948 ### revert for: missing_untracked-clean
979 949 missing_untracked-clean: no such file in rev * (glob)
980 950
@@ -1003,11 +973,6 revert all files individually and check
1003 973 ### revert for: removed_clean
1004 974 removed_clean: no such file in rev * (glob)
1005 975
1006 ### revert for: removed_deleted
1007
1008 ### revert for: removed_removed
1009 removed_removed: no such file in rev * (glob)
1010
1011 976 ### revert for: removed_revert
1012 977
1013 978 ### revert for: removed_untracked-clean
@@ -1077,11 +1042,6 revert all files individually and check
1077 1042 ### revert for: missing_clean
1078 1043 missing_clean: no such file in rev * (glob)
1079 1044
1080 ### revert for: missing_deleted
1081
1082 ### revert for: missing_removed
1083 missing_removed: no such file in rev * (glob)
1084
1085 1045 ### revert for: missing_untracked-clean
1086 1046 missing_untracked-clean: no such file in rev * (glob)
1087 1047
@@ -1109,10 +1069,6 revert all files individually and check
1109 1069
1110 1070 ### revert for: removed_clean
1111 1071
1112 ### revert for: removed_deleted
1113
1114 ### revert for: removed_removed
1115
1116 1072 ### revert for: removed_revert
1117 1073 no changes needed to removed_revert
1118 1074
General Comments 0
You need to be logged in to leave comments. Login now