Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 24125:18af6ebd4001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: silence warning of unknown pats for -l/--list (BC) It was introduced at 232de244ab6f to warn that "hg resolve" did nothing meaningful. The warning seems not good for "hg resolve -l" because it is rather like "hg status" or "hg files".
author Yuya Nishihara <yuya@tcha.org>
date Wed, 11 Feb 2015 13:47:43 +0900
parents fafd9a1284cf
children b4d21bbc2589
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Feb 09 11:02:45 2015 -0800
+++ b/mercurial/commands.py	Wed Feb 11 13:47:43 2015 +0900
@@ -5328,7 +5328,7 @@
 
         ms.commit()
 
-        if not didwork and pats:
+        if not didwork and pats and not show:
             ui.warn(_("arguments do not match paths that need resolving\n"))
 
     finally: