# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1345570077 18000
# Node ID a0cf8f4cd38ba8c35132379b680ebf6d0e900e3d
# Parent  02e2308b61f7ce2b5eef66d0246b0f24700fd986# Parent  7228def3dcc114f2c9f8c7b7733170adcb3a5630
merge with stable

diff -r 02e2308b61f7 -r a0cf8f4cd38b mercurial/localrepo.py
--- 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