Merge trunk to branch in Subversion

Question

I\'m using Subversion 1.4.6, and I cannot upgrade to version 1.5 right now.

The situation:

1. The trunk has a lot of structural changes (i.e. moving fi

Answer 1

Last revision merged from trunk to branch can be found by running this command inside the working copy directory:

svn log -v --stop-on-copy

Answer 2

Is there something that prevents you from merging all revisions on trunk since the last merge?

svn merge -rLastRevisionMergedFromTrunkToBranch:HEAD url/of/trunk path/to/branch/wc

should work just fine. At least if you want to merge all changes on trunk to your branch.

Answer 3

It is “old-fashioned” way to specify ranges of revisions you wish to merge. With 1.5+ you can use:

svn merge HEAD url/of/trunk path/to/branch/wc