# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-05-23 20:55:04
# Node ID 605b1d32c1c011d56233f28923ee5354fce7e426
# Parent  5a809deb88e65620982e708ef4df2f42158d7181
# Parent  fd905b2bea5967c71e71d25f29b2c7a04cafcadc

merge with stable

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -222,7 +222,7 @@ class transaction(object):
     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()