I’m often in the situation where I need to merge changes from the trunk development into a branch. I can never, EVER, remember the command, so I’m putting in here in hopes that I can reference it again and that other people might find it useful.
svn merge -r x:y svn://repositoryURL/repo/trunk/ .
So, how does it work? X is the revision that you branched at. This can also be the revision that you last merged changes from. Y is the version that you want to merge up to. In most instances, HEAD is probably what you’re looking for.
Note: Using –dry-run if you want to see the changes that will be made before actually doing it. It takes some of the “this is scary” out of merging.