# # # patch "cmd_diff_log.cc" # from [200a3f78f7d7d68f2918740d45a5b1daa2e37d16] # to [05b1aa9ddb1d60f9f672f0be4c6da9a4acc571b2] # # patch "legacy.cc" # from [ca81033c0dec6748f9ff1f6b080aec3889715931] # to [2b21bcfe3fde7b5fd12d4d383ab4f2609b33857b] # ============================================================ --- cmd_diff_log.cc 200a3f78f7d7d68f2918740d45a5b1daa2e37d16 +++ cmd_diff_log.cc 05b1aa9ddb1d60f9f672f0be4c6da9a4acc571b2 @@ -222,8 +222,8 @@ do_external_diff(options & opts, lua_hoo is_binary, opts.external_diff_args_given, opts.external_diff_args, - delta_entry_src(i).inner()(), - delta_entry_dst(i).inner()()); + encode_hexenc(delta_entry_src(i).inner()()), + encode_hexenc(delta_entry_dst(i).inner()())); } } ============================================================ --- legacy.cc ca81033c0dec6748f9ff1f6b080aec3889715931 +++ legacy.cc 2b21bcfe3fde7b5fd12d4d383ab4f2609b33857b @@ -82,7 +82,7 @@ namespace legacy string tmp; parser.esym(syms::old_revision); parser.hex(tmp); - old_rev = revision_id(tmp); + old_rev = revision_id(decode_hexenc(tmp)); parser.esym(syms::old_manifest); parser.hex(); @@ -137,7 +137,7 @@ namespace legacy pars.esym(syms::new_manifest); string tmp; pars.hex(tmp); - mid = manifest_id(tmp); + mid = manifest_id(decode_hexenc(tmp)); while (pars.symp(syms::old_revision)) extract_renames(pars, renames); }