Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 4005:656e06eebda7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace filehandle version of wwrite with wwritedata
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Dec 2006 20:04:31 -0600
parents 6b4127c7d52a
children 67982d3ee76c
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -20,8 +20,9 @@ def filemerge(repo, fw, fo, wctx, mctx):
     def temp(prefix, ctx):
         pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre)
+        data = repo.wwritedata(ctx.path(), ctx.data())
         f = os.fdopen(fd, "wb")
-        repo.wwrite(ctx.path(), ctx.data(), f)
+        f.write(data)
         f.close()
         return name