mercurial/util.py
changeset 4230 c93562fb12cc
parent 4229 24c22a3f2ef8
child 4232 0d51eb296fb9
child 4326 5e3936eabe5d
--- a/mercurial/util.py	Fri Mar 16 00:22:57 2007 -0300
+++ b/mercurial/util.py	Fri Mar 16 00:22:58 2007 -0300
@@ -326,6 +326,10 @@
     n2 should always be relative to root.
     '''
     if not n1: return localpath(n2)
+    if os.path.isabs(n1):
+        if os.path.splitdrive(root)[0] != os.path.splitdrive(n1)[0]:
+            return os.path.join(root, localpath(n2))
+        n2 = '/'.join((pconvert(root), n2))
     a, b = n1.split(os.sep), n2.split('/')
     a.reverse()
     b.reverse()