mercurial/transaction.py
changeset 29353 a9ccd9af48ef
parent 29299 76b07a5c064b
child 30002 599912a62ff6
equal deleted inserted replaced
29352:37c7f9fb7040 29353:a9ccd9af48ef
    70         try:
    70         try:
    71             if f and b:
    71             if f and b:
    72                 filepath = vfs.join(f)
    72                 filepath = vfs.join(f)
    73                 backuppath = vfs.join(b)
    73                 backuppath = vfs.join(b)
    74                 try:
    74                 try:
    75                     util.copyfile(backuppath, filepath)
    75                     util.copyfile(backuppath, filepath, checkambig=True)
    76                     backupfiles.append(b)
    76                     backupfiles.append(b)
    77                 except IOError:
    77                 except IOError:
    78                     report(_("failed to recover %s\n") % f)
    78                     report(_("failed to recover %s\n") % f)
    79             else:
    79             else:
    80                 target = f or b
    80                 target = f or b