Mercurial > hg

diff mercurial/localrepo.py @ 6639:6334569c8caa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: fix partial merge test (issue 1111)
author Patrick Mezard <pmezard@gmail.com>
date Wed, 28 May 2008 22:45:07 +0200
parents 41eb20cc1c02
children 602f7c1ab954
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun May 25 13:39:08 2008 -0700
+++ b/mercurial/localrepo.py	Wed May 28 22:45:07 2008 +0200
@@ -787,7 +787,7 @@
                 update_dirstate = True
 
                 if (not force and p2 != nullid and
-                    (match.files() or match.anypats())):
+                    (match and (match.files() or match.anypats()))):
                     raise util.Abort(_('cannot partially commit a merge '
                                        '(do not specify files or patterns)'))
             else: