changeset 25264:605b1d32c1c0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 23 May 2015 15:55:04 -0500
parents 5a809deb88e6 (current diff) fd905b2bea59 (diff)
children 46bf4983cf31
files mercurial/transaction.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/transaction.py	Fri May 22 21:19:08 2015 -0400
+++ b/mercurial/transaction.py	Sat May 23 15:55:04 2015 -0500
@@ -222,7 +222,7 @@
     def _addbackupentry(self, entry):
         """register a new backup entry and write it to disk"""
         self._backupentries.append(entry)
-        self._backupmap[file] = len(self._backupentries) - 1
+        self._backupmap[entry] = len(self._backupentries) - 1
         self._backupsfile.write("%s\0%s\0%s\0%d\n" % entry)
         self._backupsfile.flush()