mercurial/commands.py
changeset 21265 232de244ab6f
parent 21264 4e932dc5c113
child 21266 19d6fec60b81
--- a/mercurial/commands.py	Fri Apr 18 19:08:32 2014 -0700
+++ b/mercurial/commands.py	Fri Apr 18 18:56:26 2014 -0700
@@ -4934,10 +4934,13 @@
     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 @@
             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',