Backporting changes in renamed files to 1.7

The 1.7 files

   subversion/svn/main.c
   subversion/svnserve/main.c

were renamed in 1.8 to

   subversion/svn/svn.c
   subversion/svnserve/svnserve.c

and this causes conflicts when backporting changes from trunk. On the
branch 1.7.x-r1475724 this was resolved by doing a subtree merge and
thus recording subtree mergeinfo.

I now want to backport r1481010 and I'm wondering if using subtree
merges is the best way to handle this. My first instinct was to do a
whole branch merge and resolve the conflicts to leave a mergeinfo change
on the root. Then I noticed that the 1.7.x-r1475724 branch had takes a
different approach. Does it matter which approach is used?

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download