# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1321319790 -3600
# Node ID ac5a340b26defa58eca5ae437f1a02d5508a5ceb
# Parent  9bea3aed6ee17622c4f5f2333fa7a1a24e7480fb
subrepo: use correct paths for subrepos with ..-relative paths on windows

posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.

diff -r 9bea3aed6ee1 -r ac5a340b26de mercurial/subrepo.py
--- a/mercurial/subrepo.py	Fri Nov 11 01:07:10 2011 +0100
+++ b/mercurial/subrepo.py	Tue Nov 15 02:16:30 2011 +0100
@@ -223,7 +223,7 @@
         source.path = posixpath.normpath(source.path)
         parent = _abssource(repo._subparent, push, abort=False)
         if parent:
-            parent = util.url(parent)
+            parent = util.url(util.pconvert(parent))
             parent.path = posixpath.join(parent.path or '', source.path)
             parent.path = posixpath.normpath(parent.path)
             return str(parent)