Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: remove temporary files when using internal:dump as merge-tool stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 01 Mar 2012 17:35:12 +0100
branchstable
changeset 16205 b605448eb254
parent 16196 8ae7626d8bf1
child 16206 1970e6f61009
child 16207 374e08439ea6
filemerge: remove temporary files when using internal:dump as merge-tool
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Wed Feb 29 14:24:57 2012 +0100
+++ b/mercurial/filemerge.py	Thu Mar 01 17:35:12 2012 +0100
@@ -220,6 +220,8 @@
         util.copyfile(a, a + ".local")
         repo.wwrite(fd + ".other", fco.data(), fco.flags())
         repo.wwrite(fd + ".base", fca.data(), fca.flags())
+        os.unlink(b)
+        os.unlink(c)
         return 1 # unresolved
     else:
         args = _toolstr(ui, tool, "args", '$local $base $other')
hg-stable