From cb03917ae3636b664feb775d266fb2d97b4e340b Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Wed, 1 Feb 2012 20:03:54 -0600 Subject: [PATCH] Update def process_svn_log_entry() to enumerate possible d['kind'] cases --- svn2svn/run/svn2svn.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/svn2svn/run/svn2svn.py b/svn2svn/run/svn2svn.py index 817e207..b2ef6b6 100644 --- a/svn2svn/run/svn2svn.py +++ b/svn2svn/run/svn2svn.py @@ -465,8 +465,9 @@ def process_svn_log_entry(log_entry, options, commit_paths, prefix = ""): if path != source_base: ui.status(prefix + ">> process_svn_log_entry: Unrelated path: %s (base: %s)", path, source_base, level=ui.DEBUG, color='GREEN') continue - assert len(d['kind'])>0 - path_is_dir = True if d['kind'] == 'dir' else False + # Note: d['kind']="" for action="M" paths which only have property changes. + path_is_dir = True if d['kind'] == 'dir' else False + path_is_file = True if d['kind'] == 'file' else False # Calculate the offset (based on source_base) for this changed_path # e.g. 'projectA/file1.txt' # (path = source_base + "/" + path_offset) @@ -541,6 +542,7 @@ def process_svn_log_entry(log_entry, options, commit_paths, prefix = ""): out = run_svn(["merge", "-c", source_rev, "--non-recursive", "--non-interactive", "--accept=theirs-full", source_url+"/"+path_offset+"@"+str(source_rev), path_offset]) + # TODO: If d['props'] == 'modified', then run code to clean-up/purge any newly-modified props? else: raise InternalError("Internal Error: process_svn_log_entry: Unhandled 'action' value: '%s'" -- 2.45.2