I think the best way to approach this is to read http://www.enteract.com/~bradapp/acme/branching/ and choose the strategy that best fits the environment.
Personally, I prefer branch-per-release (where bugs are fixed) and use branch-per-task when the task is large enough to warrant a branch. If more control is needed, branch-per-task can be used to create change sets to better control changes going into a system. Noel --- "Daniels, David" <[EMAIL PROTECTED]> wrote: > There are many different ways to approach this > problem. You could, for > example, create a maintenance branch from your tag > at release 1.7. (You did > tag your code on release, right?) Or, alternatively, > you could release from > the 1.7 development branch, merging changes to the > mainline and continue to > use the 1.7 dev branch for patch releases but > creating a new dev branch for > 1.8. In this case, you'll need to dovetail the 1.7 > patches into the mainline > and 1.8 dev branch. > > Dave > > -----Original Message----- > From: Matthew Persico [mailto:[EMAIL PROTECTED]] > Sent: Tuesday, March 19, 2002 8:52 PM > To: [EMAIL PROTECTED] > Subject: Re: Develop on branch or mainline... > > > "Wim Kerkhoff" <[EMAIL PROTECTED]> wrote in message > news:[EMAIL PROTECTED]... > > > What most people suggest to develop on the > mainline. Fixes for past > > releases, expiremental development, and so on are > done on branches, then > > merged back to the mainline as appropriate. > > But what if I have released 1.7, commited 1.8 and > 1.9 but not released them > and need to fix 1.7. Can I create 1.7.1.1 if 1.8 > exists? > > > > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs __________________________________________________ Do You Yahoo!? Yahoo! Sports - live college hoops coverage http://sports.yahoo.com/ _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
