CODEWITHSUNDEEP
svnmergebranchbranching-and-mergingtrunk
CLJ
CLJ

Reputation: 1927

How do you manage your release branch in SVN?

We use Subversion for our source control system and we do our mainline work in trunk. When we released our software we created a branch. When we need to upgrade our release I will merge revision from the trunk into our branch, commit and make a tag. This approach has made it possible for us to cherry pick a revision or two from the trunk, merge it into the branch and quickly deploy the fix. However, because I am cherry picking revision numbers, it becomes difficult know what revision have made it into the branch from the trunk. Is there anyway that I can see which revisions have been merged into the trunk without recording it outside of subversion?

We are using subversion 1.6

Upvotes: 0

Views: 293

Answers (1)

pmod
pmod

Reputation: 11007

When you merge to branch with svn merge the merged revisions are automatically recorded into svn:mergeinfo property. Thus, you can cherry pick revisions to branch

cd branch
svn merge -r REV1:REV2 TRUNK_URL
svn commit -m "Cherry picked fix"

and check revisions with 

svn mergeinfo BRANCH_URL

output:

/trunk:REV1-REV2

Check this

Upvotes: 2

Related Questions