[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RFC: SVN branching strategy & tortoiseSVN

From: lonewolf2010 <lonewolfnsp_at_gmail.com>
Date: Sat, 10 Apr 2010 11:10:59 -0700 (PDT)

hi all, pls forgive me if this has been asked before. I would like to seek
advices from you guys regarding my strategy for SVN usage with regads to
branching/merging and TortoiseSVN client.

We have a project team of roughly 10 people and we adopted this strategy:
1) Each developer has a nranch that he has read/write access to.
2) Before starting on a new fix/feature, he's required to make a copy of the
trunk to a sub nranch within his own branch.
3) he proceeds to checkout from this sub nranch and work on it. When he
commits, he commits back to the sub nranch.
4) When he's done, he freezes the changes to the sub nranch and informs the
project manager.
5) once a week, the project manager makes a copy of the trunk to his own sub
nranch, merges those developer's sub branches that have completed
fixes/features and releases it for tester's validation.
6) when the testers validated the changes, the project manager will then
proceed to merge those sub branches to the trunk and informs the rest of the
developers to update their sub nranches with the updated trunk codes.

the repo structure looks something like this:

<root>
<developers> //developer branch
<John>
<Copied20100315> //sub branch copy of trunk
<Copied20100316>
<Daniel>
<Copied20100215>
<Copied20100301>
.....
<Tags>
<trunk>

We're using TortoiseSVN client. When making trunk copy, we're using
TortoiseSVN's "Copy to..." by right clicking on the trunk in Repo browser
and specfying the destination URL as a new sub branch.

when merging back to trunk or merging trunk changes to our sub branch, we're
using TortoiseSVN's Merge/Reintegrate branch. is this correct? or should I
use "Merge a range of revisions"?

Now some developers are requesting for inter branch merging, say in the
example above, Daniel working on his sub branch "Copied20100301" needs some
changes from John's sub branch "Copied20100315", does Daniel use
"Reintegrate branch" or "Merge a range of revisions"? say when daniel and
John both merges their codes back to the trunk, will it cause conflict since
daniel has John's codes that are not commited back to the trunk yet.

Could someone pls advice me whether the above usage scenario is correct and
how to improve it? is there a site with more strategies on SVN usage so I
can improve this strategy? thank you so much for your kind patience to my
long post. Have a very great day ahead. Smile

-- 
View this message in context: http://old.nabble.com/RFC%3A-SVN-branching-strategy---tortoiseSVN-tp28203759p28203759.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2549210
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-10 20:11:52 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.