Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.py @ 7570:e05aa73ce2b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use repo.wjoin(f) instead of os.path.join(repo.root, f)
author Martin Geisler <mg@daimi.au.dk>
date Fri, 02 Jan 2009 22:53:33 +0100
parents 4949729ee9ee
children 4f58147ea829
line wrap: on
line diff
--- a/mercurial/patch.py	Wed Dec 31 18:00:35 2008 -0600
+++ b/mercurial/patch.py	Fri Jan 02 22:53:33 2009 +0100
@@ -1057,7 +1057,7 @@
         gp = patches[f]
         if gp and gp.mode:
             islink, isexec = gp.mode
-            dst = os.path.join(repo.root, gp.path)
+            dst = repo.wjoin(gp.path)
             # patch won't create empty files
             if gp.op == 'ADD' and not os.path.exists(dst):
                 flags = (isexec and 'x' or '') + (islink and 'l' or '')