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