changeset 10204:3ca8f2ae5fee

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 03 Jan 2010 20:36:30 +0100
parents dcaa80294c79 (current diff) 6e26e3c2083f (diff)
children 45885e8f5704
files mercurial/patch.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Sun Jan 03 18:16:42 2010 +0100
+++ b/mercurial/patch.py	Sun Jan 03 20:36:30 2010 +0100
@@ -1166,6 +1166,8 @@
     finally:
         if cwd:
             os.chdir(curdir)
+        if fp != patchobj:
+            fp.close()
     if ret < 0:
         raise PatchError
     return ret > 0