# HG changeset patch # User Pierre-Yves David # Date 1340201240 -7200 # Node ID d508e5dd0a11352d88786d04f01b6055e9ed8620 # Parent d64f8468aaf996e85d946405a9c52b9160f912b0# Parent 9bb4217ddfcebe32571fbfabd8b4491736e86e7a merge with fix diff -r d64f8468aaf9 -r d508e5dd0a11 hgext/qsync.py --- 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: