Merging between branches and the trunk after code refactoring

Hi,

Yesterday I was asked how to complete a merge from trunk, to a branched
WC, when the branched code had been refactored. The merge from the trunk
specified a revision range where certain files where in one directory,
but the equivalent files and been moved (copy-with-history + delete) to
another dir. The merge failed because in the 1.4.x series subversion
doesn't have a "proper" rename function and can't find the files, so
can't apply the merge "patch".

Q: What is the best practice for completing such a merge?

My answer was: Complete the refactoring operation again on the trunk
(the to-branch merge was a pre merge-back-to-trunk updating activity)
and then merge. Is there a better solution? Presumably, 1.5.0 of
Subversion will not help and nothing short of completing the proper
renaming issue will...?

Thanks,
Nick.
Received on Fri Oct 26 11:42:55 2007