# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1324944500 21600
# Node ID 5b384b7f48d5c4d4b043f5cf7ca78f3f2869846e
# Parent  9b0efacd7745fda1087a816a9f93d888f4415ccd# Parent  1581da01d5c45ede387cdbd61a3a3e878fe8f657
merge with stable

diff -r 9b0efacd7745 -r 5b384b7f48d5 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Dec 26 18:07:49 2011 -0600
+++ b/mercurial/localrepo.py	Mon Dec 26 18:08:20 2011 -0600
@@ -128,6 +128,7 @@
         if not path.startswith(self.root):
             return False
         subpath = path[len(self.root) + 1:]
+        normsubpath = util.pconvert(subpath)
 
         # XXX: Checking against the current working copy is wrong in
         # the sense that it can reject things like
@@ -149,9 +150,9 @@
         ctx = self[None]
         parts = util.splitpath(subpath)
         while parts:
-            prefix = os.sep.join(parts)
+            prefix = '/'.join(parts)
             if prefix in ctx.substate:
-                if prefix == subpath:
+                if prefix == normsubpath:
                     return True
                 else:
                     sub = ctx.sub(prefix)
diff -r 9b0efacd7745 -r 5b384b7f48d5 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Mon Dec 26 18:07:49 2011 -0600
+++ b/mercurial/scmutil.py	Mon Dec 26 18:08:20 2011 -0600
@@ -85,6 +85,7 @@
         '''Check the relative path.
         path may contain a pattern (e.g. foodir/**.txt)'''
 
+        path = util.localpath(path)
         normpath = self.normcase(path)
         if normpath in self.audited:
             return
diff -r 9b0efacd7745 -r 5b384b7f48d5 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Mon Dec 26 18:07:49 2011 -0600
+++ b/mercurial/subrepo.py	Mon Dec 26 18:08:20 2011 -0600
@@ -92,7 +92,7 @@
                     src = remapped
 
         src = remap(src)
-        state[path] = (src.strip(), rev.get(path, ''), kind)
+        state[util.pconvert(path)] = (src.strip(), rev.get(path, ''), kind)
 
     return state