Show More
@@ -2381,6 +2381,7 b' def revert(ui, repo, ctx, parents, *pats' | |||||
2381 | added = set(changes[1]) |
|
2381 | added = set(changes[1]) | |
2382 | removed = set(changes[2]) |
|
2382 | removed = set(changes[2]) | |
2383 | _deleted = set(changes[3]) |
|
2383 | _deleted = set(changes[3]) | |
|
2384 | clean = set(changes[6]) | |||
2384 |
|
2385 | |||
2385 | # split between files known in target manifest and the others |
|
2386 | # split between files known in target manifest and the others | |
2386 | smf = set(mf) |
|
2387 | smf = set(mf) | |
@@ -2449,6 +2450,7 b' def revert(ui, repo, ctx, parents, *pats' | |||||
2449 | (missingadded, (actions['remove'], False)), |
|
2450 | (missingadded, (actions['remove'], False)), | |
2450 | (dsremoved, (actions['undelete'], True)), |
|
2451 | (dsremoved, (actions['undelete'], True)), | |
2451 | (missingremoved, (None, False)), |
|
2452 | (missingremoved, (None, False)), | |
|
2453 | (clean, (None, False)), | |||
2452 | ) |
|
2454 | ) | |
2453 |
|
2455 | |||
2454 | for abs, (rel, exact) in sorted(names.items()): |
|
2456 | for abs, (rel, exact) in sorted(names.items()): |
@@ -1104,8 +1104,6 b' Misbehavior:' | |||||
1104 |
|
1104 | |||
1105 | - fails to report no change to revert for |
|
1105 | - fails to report no change to revert for | |
1106 | | |
|
1106 | | | |
1107 | | - clean_clean |
|
|||
1108 | | - clean_revert |
|
|||
1109 | | - modified_revert |
|
1107 | | - modified_revert | |
1110 | | - removed_revert |
|
1108 | | - removed_revert | |
1111 |
|
1109 | |||
@@ -1136,12 +1134,14 b' Misbehavior:' | |||||
1136 | ### revert for: added_wc |
|
1134 | ### revert for: added_wc | |
1137 |
|
1135 | |||
1138 | ### revert for: clean_clean |
|
1136 | ### revert for: clean_clean | |
|
1137 | no changes needed to clean_clean | |||
1139 |
|
1138 | |||
1140 | ### revert for: clean_deleted |
|
1139 | ### revert for: clean_deleted | |
1141 |
|
1140 | |||
1142 | ### revert for: clean_removed |
|
1141 | ### revert for: clean_removed | |
1143 |
|
1142 | |||
1144 | ### revert for: clean_revert |
|
1143 | ### revert for: clean_revert | |
|
1144 | no changes needed to clean_revert | |||
1145 |
|
1145 | |||
1146 | ### revert for: clean_untracked-clean |
|
1146 | ### revert for: clean_untracked-clean | |
1147 |
|
1147 |
@@ -680,9 +680,6 b' unshelve and conflicts with tracked and ' | |||||
680 | g |
|
680 | g | |
681 | $ hg unshelve --abort |
|
681 | $ hg unshelve --abort | |
682 | rebase aborted |
|
682 | rebase aborted | |
683 | no changes needed to a |
|
|||
684 | no changes needed to d |
|
|||
685 | no changes needed to e |
|
|||
686 | unshelve of 'default' aborted |
|
683 | unshelve of 'default' aborted | |
687 | $ hg st |
|
684 | $ hg st | |
688 | ? f.orig |
|
685 | ? f.orig |
General Comments 0
You need to be logged in to leave comments.
Login now