Show More
@@ -5328,7 +5328,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
5328 |
|
5328 | |||
5329 | ms.commit() |
|
5329 | ms.commit() | |
5330 |
|
5330 | |||
5331 | if not didwork and pats: |
|
5331 | if not didwork and pats and not show: | |
5332 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
5332 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
5333 |
|
5333 | |||
5334 | finally: |
|
5334 | finally: |
@@ -43,10 +43,11 b' resolve -l should contain unresolved ent' | |||||
43 | U file1 |
|
43 | U file1 | |
44 | U file2 |
|
44 | U file2 | |
45 |
|
45 | |||
46 | resolving an unknown path should emit a warning |
|
46 | resolving an unknown path should emit a warning, but not for -l | |
47 |
|
47 | |||
48 | $ hg resolve -m does-not-exist |
|
48 | $ hg resolve -m does-not-exist | |
49 | arguments do not match paths that need resolving |
|
49 | arguments do not match paths that need resolving | |
|
50 | $ hg resolve -l does-not-exist | |||
50 |
|
51 | |||
51 | resolve the failure |
|
52 | resolve the failure | |
52 |
|
53 |
General Comments 0
You need to be logged in to leave comments.
Login now