Show More
@@ -466,8 +466,10 b' Write the python script to disk' | |||
|
466 | 466 | > |
|
467 | 467 | > # build the combination of possible states |
|
468 | 468 | > combination = [] |
|
469 | > for ctxkey in ctxcontent: | |
|
469 | > for ctxkey, ctxvalue in ctxcontent.iteritems(): | |
|
470 | 470 | > for wckey in wccontent: |
|
471 | > if (ctxvalue[0] == ctxvalue[1] and 'revert' in wckey): | |
|
472 | > continue | |
|
471 | 473 | > filename = "%s_%s" % (ctxkey, wckey) |
|
472 | 474 | > combination.append((filename, ctxkey, wckey)) |
|
473 | 475 | > |
@@ -517,17 +519,13 b' check list of planned files' | |||
|
517 | 519 | clean_clean |
|
518 | 520 | clean_deleted |
|
519 | 521 | clean_removed |
|
520 | clean_revert | |
|
521 | 522 | clean_untracked-clean |
|
522 | clean_untracked-revert | |
|
523 | 523 | clean_untracked-wc |
|
524 | 524 | clean_wc |
|
525 | 525 | missing_clean |
|
526 | 526 | missing_deleted |
|
527 | 527 | missing_removed |
|
528 | missing_revert | |
|
529 | 528 | missing_untracked-clean |
|
530 | missing_untracked-revert | |
|
531 | 529 | missing_untracked-wc |
|
532 | 530 | missing_wc |
|
533 | 531 | modified_clean |
@@ -575,9 +573,7 b' Generate base changeset' | |||
|
575 | 573 | adding clean_clean |
|
576 | 574 | adding clean_deleted |
|
577 | 575 | adding clean_removed |
|
578 | adding clean_revert | |
|
579 | 576 | adding clean_untracked-clean |
|
580 | adding clean_untracked-revert | |
|
581 | 577 | adding clean_untracked-wc |
|
582 | 578 | adding clean_wc |
|
583 | 579 | adding modified_clean |
@@ -600,9 +596,7 b' Generate base changeset' | |||
|
600 | 596 | A clean_clean |
|
601 | 597 | A clean_deleted |
|
602 | 598 | A clean_removed |
|
603 | A clean_revert | |
|
604 | 599 | A clean_untracked-clean |
|
605 | A clean_untracked-revert | |
|
606 | 600 | A clean_untracked-wc |
|
607 | 601 | A clean_wc |
|
608 | 602 | A modified_clean |
@@ -630,9 +624,7 b' Generate base changeset' | |||
|
630 | 624 | base clean_clean |
|
631 | 625 | base clean_deleted |
|
632 | 626 | base clean_removed |
|
633 | base clean_revert | |
|
634 | 627 | base clean_untracked-clean |
|
635 | base clean_untracked-revert | |
|
636 | 628 | base clean_untracked-wc |
|
637 | 629 | base clean_wc |
|
638 | 630 | base modified_clean |
@@ -714,9 +706,7 b' Create parent changeset' | |||
|
714 | 706 | base clean_clean |
|
715 | 707 | base clean_deleted |
|
716 | 708 | base clean_removed |
|
717 | base clean_revert | |
|
718 | 709 | base clean_untracked-clean |
|
719 | base clean_untracked-revert | |
|
720 | 710 | base clean_untracked-wc |
|
721 | 711 | base clean_wc |
|
722 | 712 | parent modified_clean |
@@ -762,7 +752,6 b' Setup working directory' | |||
|
762 | 752 | R added_untracked-wc |
|
763 | 753 | R clean_removed |
|
764 | 754 | R clean_untracked-clean |
|
765 | R clean_untracked-revert | |
|
766 | 755 | R clean_untracked-wc |
|
767 | 756 | R modified_removed |
|
768 | 757 | R modified_untracked-clean |
@@ -787,7 +776,6 b' Setup working directory' | |||
|
787 | 776 | A missing_wc |
|
788 | 777 | R clean_removed |
|
789 | 778 | R clean_untracked-clean |
|
790 | R clean_untracked-revert | |
|
791 | 779 | R clean_untracked-wc |
|
792 | 780 | R modified_removed |
|
793 | 781 | R modified_untracked-clean |
@@ -815,9 +803,7 b' Setup working directory' | |||
|
815 | 803 | wc added_untracked-wc |
|
816 | 804 | wc added_wc |
|
817 | 805 | base clean_clean |
|
818 | base clean_revert | |
|
819 | 806 | base clean_untracked-clean |
|
820 | base clean_untracked-revert | |
|
821 | 807 | wc clean_untracked-wc |
|
822 | 808 | wc clean_wc |
|
823 | 809 | wc missing_untracked-wc |
@@ -856,7 +842,6 b' check revert output' | |||
|
856 | 842 | reverting clean_deleted |
|
857 | 843 | undeleting clean_removed |
|
858 | 844 | undeleting clean_untracked-clean |
|
859 | undeleting clean_untracked-revert | |
|
860 | 845 | undeleting clean_untracked-wc |
|
861 | 846 | reverting clean_wc |
|
862 | 847 | forgetting missing_deleted |
@@ -912,7 +897,6 b' check revert output' | |||
|
912 | 897 | reverting clean_deleted |
|
913 | 898 | undeleting clean_removed |
|
914 | 899 | undeleting clean_untracked-clean |
|
915 | undeleting clean_untracked-revert | |
|
916 | 900 | undeleting clean_untracked-wc |
|
917 | 901 | reverting clean_wc |
|
918 | 902 | forgetting missing_deleted |
@@ -993,13 +977,8 b' revert all files individually and check ' | |||
|
993 | 977 | |
|
994 | 978 | ### revert for: clean_removed |
|
995 | 979 | |
|
996 | ### revert for: clean_revert | |
|
997 | no changes needed to clean_revert | |
|
998 | ||
|
999 | 980 | ### revert for: clean_untracked-clean |
|
1000 | 981 | |
|
1001 | ### revert for: clean_untracked-revert | |
|
1002 | ||
|
1003 | 982 | ### revert for: clean_untracked-wc |
|
1004 | 983 | |
|
1005 | 984 | ### revert for: clean_wc |
@@ -1012,15 +991,9 b' revert all files individually and check ' | |||
|
1012 | 991 | ### revert for: missing_removed |
|
1013 | 992 | missing_removed: no such file in rev * (glob) |
|
1014 | 993 | |
|
1015 | ### revert for: missing_revert | |
|
1016 | missing_revert: no such file in rev * (glob) | |
|
1017 | ||
|
1018 | 994 | ### revert for: missing_untracked-clean |
|
1019 | 995 | missing_untracked-clean: no such file in rev * (glob) |
|
1020 | 996 | |
|
1021 | ### revert for: missing_untracked-revert | |
|
1022 | missing_untracked-revert: no such file in rev * (glob) | |
|
1023 | ||
|
1024 | 997 | ### revert for: missing_untracked-wc |
|
1025 | 998 | file not managed: missing_untracked-wc |
|
1026 | 999 | |
@@ -1117,13 +1090,8 b' revert all files individually and check ' | |||
|
1117 | 1090 | |
|
1118 | 1091 | ### revert for: clean_removed |
|
1119 | 1092 | |
|
1120 | ### revert for: clean_revert | |
|
1121 | no changes needed to clean_revert | |
|
1122 | ||
|
1123 | 1093 | ### revert for: clean_untracked-clean |
|
1124 | 1094 | |
|
1125 | ### revert for: clean_untracked-revert | |
|
1126 | ||
|
1127 | 1095 | ### revert for: clean_untracked-wc |
|
1128 | 1096 | |
|
1129 | 1097 | ### revert for: clean_wc |
@@ -1136,15 +1104,9 b' revert all files individually and check ' | |||
|
1136 | 1104 | ### revert for: missing_removed |
|
1137 | 1105 | missing_removed: no such file in rev * (glob) |
|
1138 | 1106 | |
|
1139 | ### revert for: missing_revert | |
|
1140 | missing_revert: no such file in rev * (glob) | |
|
1141 | ||
|
1142 | 1107 | ### revert for: missing_untracked-clean |
|
1143 | 1108 | missing_untracked-clean: no such file in rev * (glob) |
|
1144 | 1109 | |
|
1145 | ### revert for: missing_untracked-revert | |
|
1146 | missing_untracked-revert: no such file in rev * (glob) | |
|
1147 | ||
|
1148 | 1110 | ### revert for: missing_untracked-wc |
|
1149 | 1111 | file not managed: missing_untracked-wc |
|
1150 | 1112 |
General Comments 0
You need to be logged in to leave comments.
Login now