# HG changeset patch # User Patrick Mezard # Date 1267545966 -3600 # Node ID a016b253910b5ae55a149181b1071b776f2bb543 # Parent 44c56a7727c42a955827cb63e18a0d6546c34a7a stupid: handle directory replacement in very stupid mode Known failures: - comprehensive/test_verify on replace_branch_with_branch: replaced files content is incorrect diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py --- a/hgsubversion/stupid.py +++ b/hgsubversion/stupid.py @@ -425,6 +425,10 @@ def fetch_branchrev(svn, meta, branch, b for child, k in svn.list_files(dirpath, r.revnum): if k == 'f': files.append(path + '/' + child) + if e.action == 'R': + # Check all files in replaced directory + path = path + '/' + files += [f for f in parentctx if f.startswith(path)] else: if path in parentctx: files.append(path)