Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/transaction.py
changeset 29353 a9ccd9af48ef
parent 29299 76b07a5c064b
child 30002 599912a62ff6 
--- a/mercurial/transaction.py	Mon Jun 13 05:11:56 2016 +0900
+++ b/mercurial/transaction.py	Mon Jun 13 05:11:56 2016 +0900
@@ -72,7 +72,7 @@
                 filepath = vfs.join(f)
                 backuppath = vfs.join(b)
                 try:
-                    util.copyfile(backuppath, filepath)
+                    util.copyfile(backuppath, filepath, checkambig=True)
                     backupfiles.append(b)
                 except IOError:
                     report(_("failed to recover %s\n") % f)
Mercurial