diff mercurial/subrepo.py @ 13122:4a13ca2c21ce

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 10 Dec 2010 23:05:48 +0100
parents c922aacf6f1f 2245fcd0e160
children e76701bf4480
line wrap: on
line diff
--- a/mercurial/subrepo.py	Wed Dec 08 13:12:12 2010 -0600
+++ b/mercurial/subrepo.py	Fri Dec 10 23:05:48 2010 +0100
@@ -333,6 +333,8 @@
 
             def addpathconfig(key, value):
                 if value:
+                    if not os.path.isabs(value):
+                        value = os.path.relpath(os.path.abspath(value), root)
                     fp.write('%s = %s\n' % (key, value))
                     self._repo.ui.setconfig('paths', key, value)