Best IT Recipes

Merge a branch chest in Subversion

I am using Subversion 1.4.6, and now I can’t upgrade to version 1.5.

Situation:

  • The chest has many structural changes (i.e. moving files around, basically).

  • I have a branch that has recently been merged with the trunk, but before major changes.

What is the best way to merge a trunk with a branch?

What did I mean:

  • First carefully merge the branch into the trunk, combining only the changed files in the branch into a trunk.

  • Copy the trunk to a branch. What is the best way to do this without losing industry history? Should I abandon the branch and create a new one?



Well, it looks like I didn’t get enough SVN credit. In the end, it's smart enough. I was just turned off by the output of "D" and "A", but in the background it made a move.

+67
merge svn
Dec 30 '09 at 6:43
source share
3 answers

Is there something that is stopping you from merging all revisions on your torso since you last merged?

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

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

+81
Dec 30 '09 at 7:15
source share

The latest revision, combined with the trunk to the branch, can be found by running this command in the working copy directory:

 svn log -v --stop-on-copy
+15
Jan 31 '10 at 6:11
source share

This is the "old fashioned" way of specifying the ranges of changes you want to merge. With 1.5+ you can use:

 svn merge HEAD url/of/trunk path/to/branch/wc
+9
May 27 '13 at 13:17
source share


More articles:


All Articles