changeset 25302:bcb17d7dbec2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 27 May 2015 17:41:42 -0500
parents caaf4045eca8 (current diff) b1b89a0a606d (diff)
children b7876b8fa063
files mercurial/transaction.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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()