0

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

CLJ
  • 1,907
  • 5
  • 22
  • 36

1 Answers1

2

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

pmod
  • 10,450
  • 1
  • 37
  • 50
  • I see how that is done, but I am guessing that because I did the merge with TortoiseSVN and checked "ignore ancestry", that ruined the lineage and svn did not record it in the svn:mergeinfo property. Is that correct? – CLJ Oct 10 '11 at 15:39
  • 1
    I suppose yes (haven't tried that); found this: http://stackoverflow.com/questions/622409/tortoisesvn-using-svnmergeinfo-is-there-a-way-to-turn-it-off/1280749#1280749 – pmod Oct 11 '11 at 07:58
  • That was my problem. Thanks for your help. – CLJ Oct 12 '11 at 11:51