crunchlife: Subversion: Merging a Branch into Trunk

Subversion: Merging a Branch into Trunk

Ryan Baxter — Tue, 25 Aug 2009 18:21:00 -0700

I can never remember how to merge a Subversion branch into trunk. So for future reference, here is how it’s done.

First, get a working copy of the head revision of trunk.

svn checkout svn://svnserver/project/trunk project

Next, merge the branch with your working copy.

svn merge svn://svnserver/project/trunk svn://svnserver/project/branches/branch project

Finally, commit the results of the merge.

cd project
svn commit -m "Merging branch X.X.X into trunk."

You can also specify a revision number in your merge.

svn merge svn://svnserver/project/trunk@223 svn://svnserver/project/branches/branch@223 project

That’s it.

"Subversion: Merging a Branch into Trunk" by Ryan Baxter

Mon, 08 Mar 2010 07:42:33 -0800

Joel - Yes, you should probably perform an update on a previously checked out trunk. I'll add that to this post.

"Subversion: Merging a Branch into Trunk" by Joel

Sun, 21 Feb 2010 06:28:43 -0800

Looks like this is only good if the trunk hasn't changed since you created the branch. If the is not the case, recent changes to the trunk will be reverted!

"Subversion: Merging a Branch into Trunk" by Abidi

Wed, 17 Feb 2010 07:51:33 -0800

Once you have trunk checked out do we need to specify the trunk URL in the merge command, can we just say "svn merge svn://svnserver/project/branches/branch/project". When we merge trunk into a branch it works without specifying the target (branch) as branch is checked out?