Mercurial > hg

changeset 8861:90f74b31ed4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix internal:dump
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 16:42:51 -0500
parents 36654238c050
children cd96f159a2d3
files mercurial/filemerge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Jun 20 16:42:51 2009 -0500
+++ b/mercurial/filemerge.py	Sat Jun 20 16:42:51 2009 -0500
@@ -195,8 +195,8 @@
     elif tool == 'internal:dump':
         a = repo.wjoin(fd)
         util.copyfile(a, a + ".local")
-        repo.wwrite(a + ".other", fco.data(), fco.flags())
-        repo.wwrite(a + ".base", fca.data(), fca.flags())
+        repo.wwrite(fd + ".other", fco.data(), fco.flags())
+        repo.wwrite(fd + ".base", fca.data(), fca.flags())
         return 1 # unresolved
     else:
         args = _toolstr(ui, tool, "args", '$local $base $other')