CODEWITHSUNDEEP
svn
Yalamber
Yalamber

Reputation: 7580

Merging Release Branches changes to trunk

Here is my case: First I have trunk, branches, tags in my repo. I have release branch at branches/RB1.x trunk has all lates codes being worked on. I needed to work on release branch RB1.x, so I made changes to it. Now how do i merge those changes to trunk?

Upvotes: 0

Views: 176

Answers (2)

rlovtang
rlovtang

Reputation: 5060

Given you are not using svn 1.4 or older:

From trunk, run:

svn merge ^/branches/RB1.x

This is using the merge tracking feature, so you should be able to do this multiple times without getting the same changes merged over and over.

Or you can specify version ranges as arkascha explains.

Upvotes: 1

arkascha
arkascha

Reputation: 42915

This is a standard situation you have.

You can simply use the svn command to merge changes from a branch into the trunk: 

svn merge -r x:y https://someserver/repo/project/branch/123 trunk

where x and y are revision numbers and trunk is a checkout of your trunk.

After having cleaned up any conflicts you can checkin the modifications. It is a good practise to use a standard revision comment that includes the merged revision numbers. That way it gets easier to identify what revisions have already been merged later on.

Upvotes: 1

Related Questions