Mercurial > hg-stable

changeset 24383:521cecb4a3f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: simplify by using match.always() method
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Oct 2014 22:43:59 -0700
parents 5859af34c5a6
children 5cb459dc32d2
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Sep 30 16:40:15 2014 -0700
+++ b/mercurial/localrepo.py	Tue Oct 28 22:43:59 2014 -0700
@@ -1315,7 +1315,7 @@
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if (not force and merge and (match.files() or match.anypats())):
+            if not force and merge and not match.always():
                 raise util.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))