I have committed a small but significant feature to #SVN trunk:
Merging a cherry-pick of an edit from a moved file to the file's corresponding pre-move location on an older branch now works out of the box without annoying conflict prompts (beyond a possible text merge conflict, of course).
A tree conflict occurs because after Subversion 1.7 was branched from trunk, svn's own main C file was renamed in trunk from "main.c" to "svn.c". With my change from today, the resulting tree conflict is now automatically resolved. Previously, the merge stopped after the step "Tree conflict on 'subversion/svn/svn.c':" with SVN complaning that it didn't know how to handle the merge 🙄