SVN tags and branches

Associate
Joined
18 Oct 2002
Posts
1,312
Location
Milton Keynes
Hey all

Looking for users of subversion. First off I have read The Book. I have been using svn for a while to track projects and used for collaboration etc, but I dont think I am getting as much out of it as I could. Although the book has given me a basic understanding of how branches and tags work, because there is so much to read on the subjects its a bit overkill really.

Found a good diagram here ( http://en.wikipedia.org/wiki/Subversion_(software)#Branching_and_tagging ), but could still do with confirmation from a fellow user about how it is best used and implemented.

Example for website version control. We have an in house framework, which would be in the trunk. Then if we have a set release say 2.5 that would be a tag, no further commits would happen on this copy and would be for archiving only. Then say we wanted to make a new site that would be using the framework, this would be a branch that would take the current trunk as a start point and have new development go from there. If we develop something that would need to go into the main trunk, would it just be a case of merging those files with the trunk?

This sound about right? If not please point me in the right direction. Also would be interested in hearing about other peoples use and management of SVN and their projects, from lone devs to collaborative teams.

Cheers
 
hah totally forgot i made this post, nice one for replies, and sorry to res an oldy :)

sort of muddled through it on my own, but just to clarify, when you merge from branch back into trunk, it seems to only be copying the changes from the branchs rep to my trunks working copy, do I then need to commit those changes again to the trunk?
 
yeah i was going to say what happens when you have multiple branches and you want to commit to trunk and merge with all

ahh man this is giving me a headache lol
 
Back
Top Bottom