Correction to my message of a few hours ago: Somehow I copy/pasted the subject from something that didn't match what I was doing at all. The subject should have read something like: "[PATCH] svnmerge.py fix for merging in renamed files/directories".