From 51d05aa7eefcd57f4becccb4bf206a6a474c65bc Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Thu, 22 Dec 2011 17:10:41 -0600 Subject: [PATCH] Fix run_svn_log @rev handling, don't run svn add on paths already in svn --- svn2svn.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/svn2svn.py b/svn2svn.py index 9a9e49c..cfed985 100755 --- a/svn2svn.py +++ b/svn2svn.py @@ -268,7 +268,7 @@ def run_svn_log(svn_url_or_wc, rev_start, rev_end, limit, stop_on_copy=False): if rev_start != 'HEAD' and rev_end != 'HEAD': args += ['-r', '%s:%s' % (rev_start, rev_end)] if not "@" in svn_url_or_wc: - url += "@" + str(rev_end) + url += "@" + str(max(rev_start, rev_end)) args += ['--limit', str(limit), url] xml_string = run_svn(svn_log_args + args) return parse_svn_log_xml(xml_string) @@ -644,7 +644,8 @@ def process_svn_log_entry(log_entry, source_repos_url, source_url, target_url, s # Export the entire added tree. run_svn(["export", "--force", "-r", str(copyfrom_rev), source_repos_url + copyfrom_path + "@" + str(copyfrom_rev), path_offset]) - run_svn(["add", "--parents", path_offset]) + if not in_svn(path_offset): + run_svn(["add", "--parents", path_offset]) # TODO: Need to copy SVN properties from source repos elif action == 'D': -- 2.45.2