##// END OF EJS Templates
revert: issue "no changes needed" message for files missing on both side...
Pierre-Yves David -
r22156:03a45eff default
parent child Browse files
Show More
@@ -2466,7 +2466,11 b' def revert(ui, repo, ctx, parents, *pats'
2466 for table, (action, backup) in disptable:
2466 for table, (action, backup) in disptable:
2467 if abs not in table:
2467 if abs not in table:
2468 continue
2468 continue
2469 if action is not None:
2469 if action is None:
2470 if exact:
2471 ui.warn(_('no changes needed to %s\n') % rel)
2472
2473 else:
2470 handle(action, backup)
2474 handle(action, backup)
2471 break
2475 break
2472 else:
2476 else:
@@ -143,9 +143,10 b' exact match are more silent'
143 $ hg st d
143 $ hg st d
144 R d
144 R d
145
145
146 should silently keep d removed
146 should keep d removed
147
147
148 $ hg revert -r0 d
148 $ hg revert -r0 d
149 no changes needed to d
149 $ hg st d
150 $ hg st d
150 R d
151 R d
151
152
@@ -1104,14 +1105,9 b' Misbehavior:'
1104 - fails to report no change to revert for
1105 - fails to report no change to revert for
1105 |
1106 |
1106 | - clean_clean
1107 | - clean_clean
1107 | - added_revert
1108 | - clean_revert
1108 | - clean_revert
1109 | - modified_revert
1109 | - modified_revert
1110 | - removed_revert
1110 | - removed_revert
1111 | - added_removed
1112 | - added_untracked-clean
1113 | - added_untracked-revert
1114 | - added_untracked-wc
1115
1111
1116 $ for file in `python ../gen-revert-cases.py filelist`; do
1112 $ for file in `python ../gen-revert-cases.py filelist`; do
1117 > echo '### revert for:' $file;
1113 > echo '### revert for:' $file;
@@ -1123,14 +1119,19 b' Misbehavior:'
1123 ### revert for: added_deleted
1119 ### revert for: added_deleted
1124
1120
1125 ### revert for: added_removed
1121 ### revert for: added_removed
1122 no changes needed to added_removed
1126
1123
1127 ### revert for: added_revert
1124 ### revert for: added_revert
1125 no changes needed to added_revert
1128
1126
1129 ### revert for: added_untracked-clean
1127 ### revert for: added_untracked-clean
1128 no changes needed to added_untracked-clean
1130
1129
1131 ### revert for: added_untracked-revert
1130 ### revert for: added_untracked-revert
1131 no changes needed to added_untracked-revert
1132
1132
1133 ### revert for: added_untracked-wc
1133 ### revert for: added_untracked-wc
1134 no changes needed to added_untracked-wc
1134
1135
1135 ### revert for: added_wc
1136 ### revert for: added_wc
1136
1137
General Comments 0
You need to be logged in to leave comments. Login now