Comments
Patch
@@ -4933,12 +4933,15 @@ 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)
else:
@@ -4969,8 +4972,12 @@ def resolve(ui, repo, *pats, **opts):
# replace filemerge's .orig file with our resolve file
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',
[('a', 'all', None, _('revert all changes when no arguments given')),
@@ -30,8 +30,12 @@ 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
$ hg resolve -m file