merge with fix stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Wed, 20 Jun 2012 16:07:01 +0200
branchstable
changeset 290 dd8c75df66e3
parent 287 bcd96748edc4 (current diff)
parent 289 9bb4217ddfce (diff)
child 292 f9b580a7c754
merge with fix
--- a/hgext/qsync.py	Wed Jun 20 15:57:35 2012 +0200
+++ b/hgext/qsync.py	Wed Jun 20 16:07:01 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: