diff mercurial/subrepo.py @ 15735:5b384b7f48d5

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Dec 2011 18:08:20 -0600
parents 309e49491253 1581da01d5c4
children 4bc715f2a356
line wrap: on
line diff
--- 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