[cvsnt] Merge Philosophy - Request for Comments

Dianne Chen diana_chen23 at yahoo.com
Fri Nov 5 18:58:32 GMT 2004


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Hi all-

Inexperienced with CVS, but experienced with using
other CM tools (esp. Clearcase).

I would appreciate the user community's opinions,
critiques, and suggested improvements on using CVS in
a "multiple-developers on a single program"
environment. 

I would like to set it up so that:

1) Each developer works on their own development
branch, rooted from the trunk.
2) No developer works on the trunk.
3) When the first developer is done, they merge their
work to an integration branch, also rooted from the
trunk (from the same point as #1, I bet).
4) When the second developer is done, they reconcile
the differences between their branch and the
integration branch, and then merge the result to the
integration branch.
5) Each of the remaining developers repeats step 4,
until all developers have their changes onto the
Integration branch.
6) The final contents on the Integration branch are
then rebuilt by the team lead, who tags it and
releases it to testing.
7) Once testing is complete, and the go-ahead has been
received, the contents of the integration branch are
then merged to the trunk, officially released, and the
next activity can begin.
8) Inherent in this is the desire to always have the
latest, working, approved code on the trunk.

Is this doable?

Is there a better way to isolate development activity,
but yet still provide a merge area for code
integration activity that doesn't impact the trunk?

Much, much thanks.

DC


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook