diff -r 76b07a5c064b -r f92afd23a099 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Fri Jun 03 00:44:20 2016 +0900
+++ b/mercurial/bookmarks.py	Fri Jun 03 00:44:20 2016 +0900
@@ -117,7 +117,8 @@
             rbm._writeactive()
 
         with repo.wlock():
-            file_ = repo.vfs('bookmarks', 'w', atomictemp=True)
+            file_ = repo.vfs('bookmarks', 'w', atomictemp=True,
+                             checkambig=True)
             try:
                 self._write(file_)
             except: # re-raises
@@ -131,7 +132,8 @@
             return
         with self._repo.wlock():
             if self._active is not None:
-                f = self._repo.vfs('bookmarks.current', 'w', atomictemp=True)
+                f = self._repo.vfs('bookmarks.current', 'w', atomictemp=True,
+                                   checkambig=True)
                 try:
                     f.write(encoding.fromlocal(self._active))
                 finally: