"Naive" svn merge from branch into trunk?

Question

I am using TortoiseSVN for my C++ project, and am trying to "reintegrate a branch" back into the trunk.

My case is simple enough so that for every file which has changed in the branch, I would like it to completely overwrite the matching file in the trunk. Unfortunately, TortoiseSVN is smarter than me, so it merges each pair of files - resulting in some inconsistent code. For example, some code lines which have been deleted in the branch are restored in the merged version.

Is there any way to force TortoiseSVN to use the naive merge behaviour of overwriting all the modified files?

Thanks, Dan

Answer 1

Here's how to do it just using SVN (no mucking about in the filesystem):

1. Check out the trunk revision from which you created the branch (not the HEAD revision).
2. Commit it to the repository (this undoes all subsequent trunk changes).
3. Do your reintegrate-merge (your trunk working copy should now be identical to the branch.)
4. Commit the merged trunk, and you're done!