diff options
Diffstat (limited to 'devel/mercurial/patches')
-rw-r--r-- | devel/mercurial/patches/patch-ab | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/devel/mercurial/patches/patch-ab b/devel/mercurial/patches/patch-ab new file mode 100644 index 00000000000..f35701fe997 --- /dev/null +++ b/devel/mercurial/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.1 2008/07/19 13:36:51 drochner Exp $ + +--- mercurial/patch.py.orig 2008-07-19 15:16:17.000000000 +0200 ++++ mercurial/patch.py +@@ -1039,9 +1039,12 @@ def applydiff(ui, fp, changed, strip=1, + continue + elif state == 'git': + gitpatches = values ++ cwd = os.getcwd() + for gp in gitpatches: + if gp.op in ('COPY', 'RENAME'): +- copyfile(gp.oldpath, gp.path) ++ src, dst = [util.canonpath(cwd, cwd, x) ++ for x in [gp.oldpath, gp.path]] ++ copyfile(src, dst) + changed[gp.path] = (gp.op, gp) + else: + raise util.Abort(_('unsupported parser state: %s') % state) |