Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorSteve Borho <steve@borho.org>
Tue, 06 Oct 2009 16:08:38 -0500
changeset 9544 b6b0c42739e9
parent 9543 56a5f80556f5 (current diff)
parent 9529 e61e7b3e46d0 (diff)
child 9545 98feea5659d9
Merge with crew-stable
mercurial/util.py file | annotate | diff | comparison | revisions 
--- a/mercurial/util.py	Mon Oct 05 22:57:15 2009 +0200
+++ b/mercurial/util.py	Tue Oct 06 16:08:38 2009 -0500
@@ -427,7 +427,14 @@
 
         temp = tempname(dst)
         os.rename(dst, temp)
-        os.unlink(temp)
+        try:
+            os.unlink(temp)
+        except:
+            # Some rude AV-scanners on Windows may cause the unlink to
+            # fail. Not aborting here just leaks the temp file, whereas
+            # aborting at this point may leave serious inconsistencies.
+            # Ideally, we would notify the user here.
+            pass
         os.rename(src, dst)
 
 def unlink(f):
Mercurial