RTFA: http://svn.haxx.se/users/archive-2005-10/0247.shtm…

“svn merge A B C” means “make a set of instructions that convert A into B, and perform the instructions on C.” If you don’t specify C, it means “the working copy I’m in right now.” So what you want to do is take the set of changes that exist between trunk and the branch, and apply them to a working copy of trunk.

svn merge svn://server/trunk_at_1234 svn://server/branches/branch_at_1234 /path/to/working/copy/of/trunk

I was trying to do something like this, and for a variety of reasons, I was having trouble… the code above is basically good enough to cut-and-paste.

Merging is tricky… but this explanation is lucid. Enjoy!