mercurial/dirstate.py

--- a/mercurial/dirstate.py	Fri Jun 03 00:44:20 2016 +0900
+++ b/mercurial/dirstate.py	Fri Jun 03 00:44:20 2016 +0900
@@ -367,7 +367,7 @@
 
     def setbranch(self, branch):
         self._branch = encoding.fromlocal(branch)
-        f = self._opener('branch', 'w', atomictemp=True)
+        f = self._opener('branch', 'w', atomictemp=True, checkambig=True)
         try:
             f.write(self._branch + '\n')
             f.close()