# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1432766502 18000
# Node ID bcb17d7dbec25088eaec5e4d34dedbd7057c5d68
# Parent  caaf4045eca8759a3a415bd81337fc85294178c1# Parent  b1b89a0a606d74bfb48dfad239a352c55d3499b3
merge with stable

diff -r caaf4045eca8 -r bcb17d7dbec2 mercurial/transaction.py
--- a/mercurial/transaction.py	Wed May 27 13:28:16 2015 -0400
+++ b/mercurial/transaction.py	Wed May 27 17:41:42 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[entry] = len(self._backupentries) - 1
+        self._backupmap[entry[1]] = len(self._backupentries) - 1
         self._backupsfile.write("%s\0%s\0%s\0%d\n" % entry)
         self._backupsfile.flush()