##// END OF EJS Templates
test-revert: reverting an addition is the same as removing...
Martin von Zweigbergk -
r23154:690db741 default
parent child Browse files
Show More
@@ -470,6 +470,8 b' Write the python script to disk'
470 470 > for wckey in wccontent:
471 471 > if (ctxvalue[0] == ctxvalue[1] and 'revert' in wckey):
472 472 > continue
473 > if not ctxvalue[0] and 'revert' in wckey:
474 > continue
473 475 > filename = "%s_%s" % (ctxkey, wckey)
474 476 > combination.append((filename, ctxkey, wckey))
475 477 >
@@ -511,9 +513,7 b' check list of planned files'
511 513 added_clean
512 514 added_deleted
513 515 added_removed
514 added_revert
515 516 added_untracked-clean
516 added_untracked-revert
517 517 added_untracked-wc
518 518 added_wc
519 519 clean_clean
@@ -651,9 +651,7 b' Create parent changeset'
651 651 adding added_clean
652 652 adding added_deleted
653 653 adding added_removed
654 adding added_revert
655 654 adding added_untracked-clean
656 adding added_untracked-revert
657 655 adding added_untracked-wc
658 656 adding added_wc
659 657 removing removed_clean
@@ -676,9 +674,7 b' Create parent changeset'
676 674 A added_clean
677 675 A added_deleted
678 676 A added_removed
679 A added_revert
680 677 A added_untracked-clean
681 A added_untracked-revert
682 678 A added_untracked-wc
683 679 A added_wc
684 680 R removed_clean
@@ -698,9 +694,7 b' Create parent changeset'
698 694 parent added_clean
699 695 parent added_deleted
700 696 parent added_removed
701 parent added_revert
702 697 parent added_untracked-clean
703 parent added_untracked-revert
704 698 parent added_untracked-wc
705 699 parent added_wc
706 700 base clean_clean
@@ -723,8 +717,6 b' Setup working directory'
723 717 $ python ../gen-revert-cases.py wc
724 718 $ hg addremove --similarity 0
725 719 removing added_removed
726 removing added_revert
727 removing added_untracked-revert
728 720 removing clean_removed
729 721 adding missing_deleted
730 722 adding missing_untracked-wc
@@ -746,9 +738,7 b' Setup working directory'
746 738 A removed_revert
747 739 A removed_wc
748 740 R added_removed
749 R added_revert
750 741 R added_untracked-clean
751 R added_untracked-revert
752 742 R added_untracked-wc
753 743 R clean_removed
754 744 R clean_untracked-clean
@@ -834,9 +824,7 b' check revert output'
834 824 $ hg revert --all
835 825 reverting added_deleted
836 826 undeleting added_removed
837 undeleting added_revert
838 827 undeleting added_untracked-clean
839 undeleting added_untracked-revert
840 828 undeleting added_untracked-wc
841 829 reverting added_wc
842 830 reverting clean_deleted
@@ -960,12 +948,8 b' revert all files individually and check '
960 948
961 949 ### revert for: added_removed
962 950
963 ### revert for: added_revert
964
965 951 ### revert for: added_untracked-clean
966 952
967 ### revert for: added_untracked-revert
968
969 953 ### revert for: added_untracked-wc
970 954
971 955 ### revert for: added_wc
@@ -1069,15 +1053,9 b' revert all files individually and check '
1069 1053 ### revert for: added_removed
1070 1054 no changes needed to added_removed
1071 1055
1072 ### revert for: added_revert
1073 no changes needed to added_revert
1074
1075 1056 ### revert for: added_untracked-clean
1076 1057 no changes needed to added_untracked-clean
1077 1058
1078 ### revert for: added_untracked-revert
1079 no changes needed to added_untracked-revert
1080
1081 1059 ### revert for: added_untracked-wc
1082 1060 no changes needed to added_untracked-wc
1083 1061
General Comments 0
You need to be logged in to leave comments. Login now