# HG changeset patch # User Augie Fackler # Date 1225813258 21600 # Node ID a8b9c7e7c2ac2eec48686533b347d5e600e9e743 # Parent c3c5546eefb1eeee2ded1f2f548a42ac3b2d1772 Fix a bug in real replay where dirs copied from outside the directory tree weren't removing the prefix within the repo. diff --git a/fetch_command.py b/fetch_command.py --- a/fetch_command.py +++ b/fetch_command.py @@ -149,7 +149,10 @@ def replay_convert_rev(hg_editor, svn, r p = dirs_to_list.pop(0) cleanup_file_handles(svn, i) i += 1 - l = svn.list_dir(p[:-1], r.revnum) + p2 = p[:-1] + if svn.subdir: + p2 = p2[len(svn.subdir)-1:] + l = svn.list_dir(p2, r.revnum) for f in l: if l[f].kind == core.svn_node_dir: