# HG changeset patch # User Augie Fackler # Date 1334874608 18000 # Node ID 39d45f2190ee7a8079b9bfc32b9ac4d8181dbd8e # Parent 6ef6c413d6ded4b367e0f7be7990d5b449dace1b# Parent c24130e9ddb79d6a6efcf00a790d5910344a69f1 Merge diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py --- a/hgsubversion/stupid.py +++ b/hgsubversion/stupid.py @@ -344,6 +344,10 @@ def diff_branchrev(ui, svn, meta, branch copies = getcopies(svn, meta, branch, branchpath, r, touched_files, parentctx) + # We note binary files because svn's diff format doesn't describe + # what changed, only that a change occurred. This means we'll have + # to pull them as fulltexts from the server outside the diff + # apply. binary_files = set(f.name for f in changed if f.binary) exec_files = dict((f.name, f.executable) for f in changed if f.executable is not None)