What's the difference between “svn merge --reintegrate” and svn merge without reintegrate if I'd like to merge a branch onto the trunk

Question

In the svn book it says merge\'s --reintegrate is \"to merge all of the source URL\'s changes into the working copy\".

I would like to merge

Answer 1

Upgrade to svn 1.8 and don't worrry about it anymore, it will automatically figure out what to do.

from the svn 1.8 release notes:

During merges which merge all eligible revisions from another branch, Subversion 1.8 will automatically decide whether or not the merge is reintegrating a branch. Therefore, reintegrating a branch does no longer require the --reintegrate option for correct operation.