Show More
@@ -5511,7 +5511,8 b' def revert(ui, repo, *pats, **opts):' | |||||
5511 |
|
5511 | |||
5512 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5512 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5513 |
|
5513 | |||
5514 |
if |
|
5514 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
|
5515 | opts.get('all') or opts.get('interactive'))): | |||
5515 | msg = _("no files or directories specified") |
|
5516 | msg = _("no files or directories specified") | |
5516 | if p2 != nullid: |
|
5517 | if p2 != nullid: | |
5517 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5518 | hint = _("uncommitted merge, use --all to discard all changes," |
@@ -201,12 +201,26 b' call `hg revert` with no file specified' | |||||
201 | (use --all to revert all files, or 'hg update 1' to update) |
|
201 | (use --all to revert all files, or 'hg update 1' to update) | |
202 | [255] |
|
202 | [255] | |
203 |
|
203 | |||
|
204 | call `hg revert` with -I | |||
|
205 | --------------------------- | |||
|
206 | ||||
|
207 | $ echo a >> a | |||
|
208 | $ hg revert -I a | |||
|
209 | reverting a | |||
|
210 | ||||
|
211 | call `hg revert` with -X | |||
|
212 | --------------------------- | |||
|
213 | ||||
|
214 | $ echo a >> a | |||
|
215 | $ hg revert -X d | |||
|
216 | reverting a | |||
|
217 | ||||
204 |
call ` |
|
218 | call `hg revert` with --all | |
205 | --------------------------- |
|
219 | --------------------------- | |
206 |
|
220 | |||
207 | $ hg revert --all -rtip |
|
221 | $ hg revert --all -rtip | |
208 | reverting a |
|
222 | reverting a | |
209 |
|
223 | $ rm *.orig | ||
210 |
|
224 | |||
211 | Issue332: confusing message when reverting directory |
|
225 | Issue332: confusing message when reverting directory | |
212 | ---------------------------------------------------- |
|
226 | ---------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now