changeset 291:d508e5dd0a11

merge with fix
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 20 Jun 2012 16:07:20 +0200
parents d64f8468aaf9 (current diff) 9bb4217ddfce (diff)
children 98c9c69c311d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/qsync.py	Wed Jun 20 15:57:57 2012 +0200
+++ b/hgext/qsync.py	Wed Jun 20 16:07:20 2012 +0200
@@ -75,7 +75,7 @@
     applied_list = []
     if review:
         olddata = get_old_data(parent)
-        oldfiles = dict([(name, ctxhex) for ctxhex, name in olddata])
+        oldfiles = dict([(name, bin(ctxhex)) for ctxhex, name in olddata])
 
         for patch_name in touched:
             try: