# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1355720574 21600
# Node ID 3d1dc7aeca39446b6b2f7966e4890283f6560d63
# Parent  2c1fc483efa493ceea74329b9b98f3f813828795# Parent  777084ac84167e3bdea45b5c00de1106cca36eef
merge with crew-stable

diff -r 2c1fc483efa4 -r 3d1dc7aeca39 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Sun Dec 16 22:00:38 2012 -0600
+++ b/mercurial/dirstate.py	Sun Dec 16 23:02:54 2012 -0600
@@ -264,8 +264,10 @@
         f = self._opener('branch', 'w', atomictemp=True)
         try:
             f.write(self._branch + '\n')
-        finally:
             f.close()
+        except: # re-raises
+            f.discard()
+            raise
 
     def _read(self):
         self._map = {}