diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4934,10 +4934,13 @@ def resolve(ui, repo, *pats, **opts): m = scmutil.match(repo[None], pats, opts) ret = 0 + didwork = False for f in ms: if not m(f): continue + didwork = True + if show: if nostatus: ui.write("%s\n" % f) @@ -4970,6 +4973,10 @@ def resolve(ui, repo, *pats, **opts): util.rename(a + ".resolve", a + ".orig") ms.commit() + + if not didwork and pats: + ui.warn(_("arguments do not match paths that need resolved\n")) + return ret @command('revert', diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -31,6 +31,10 @@ resolve -l should contain an unresolved $ hg resolve -l U file +resolving an unknown path emits a warning + $ hg resolve -m does-not-exist + arguments do not match paths that need resolved + resolve the failure $ echo resolved > file