# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1254863318 18000
# Node ID b6b0c42739e986939e78156678c0e707c06b76c2
# Parent  56a5f80556f5b27b4d8579d1949dcbfeaf62e030# Parent  e61e7b3e46d0c52008132bfe31466c76910f831f
Merge with crew-stable

diff -r 56a5f80556f5 -r b6b0c42739e9 mercurial/util.py
--- 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):