diff -r bebe7d1c38c8 -r 37c7f9fb7040 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Jun 13 05:11:56 2016 +0900
+++ b/mercurial/localrepo.py	Mon Jun 13 05:11:56 2016 +0900
@@ -1172,9 +1172,9 @@
         vfsmap = {'plain': self.vfs, '': self.svfs}
         transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn)
         if self.vfs.exists('undo.bookmarks'):
-            self.vfs.rename('undo.bookmarks', 'bookmarks')
+            self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
         if self.svfs.exists('undo.phaseroots'):
-            self.svfs.rename('undo.phaseroots', 'phaseroots')
+            self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
         self.invalidate()
 
         parentgone = (parents[0] not in self.changelog.nodemap or