In my existing (Pre-SVN 1.5) merge strategy, we create a copy of the Trunk (called BasePoint) at the moment of branch-creation for referencing later during the merge.
Whe
A good blog post about merging problems in svn (and what reintegrate does) is here.