Mercurial > hg

changeset 17382:a0cf8f4cd38b

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 Tue, 21 Aug 2012 12:27:57 -0500
parents 02e2308b61f7 (current diff) 7228def3dcc1 (diff)
children 4b87d947c4e1
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Aug 21 12:27:47 2012 -0500
+++ b/mercurial/localrepo.py	Tue Aug 21 12:27:57 2012 -0500
@@ -1312,6 +1312,7 @@
                 matched = set(changes[0] + changes[1] + changes[2])
 
                 for f in match.files():
+                    f = self.dirstate.normalize(f)
                     if f == '.' or f in matched or f in wctx.substate:
                         continue
                     if f in changes[3]: # missing