merge with crew-stable

merge with crew-stable

--- 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 = {}