Mercurial > hg

changeset 15498:ac5a340b26de stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Nov 2011 02:16:30 +0100
parents 9bea3aed6ee1
children 58f96703a9ab
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)