Mercurial > hg-stable

diff mercurial/localrepo.py @ 16151:a01d2fb5ba65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Feb 2012 17:36:33 -0600
parents 004982e5d782 4546a8513dcd
children 85db991780b7
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Feb 22 12:30:15 2012 +0100
+++ b/mercurial/localrepo.py	Wed Feb 22 17:36:33 2012 -0600
@@ -1371,7 +1371,9 @@
 
         if not parentworking:
             def bad(f, msg):
-                if f not in ctx1:
+                # 'f' may be a directory pattern from 'match.files()',
+                # so 'f not in ctx1' is not enough
+                if f not in ctx1 and f not in ctx1.dirs():
                     self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
             match.bad = bad