[ On Wednesday, August 9, 2000 at 23:52:44 (-0500), Rohit Desai wrote: ]
> Subject: Generic Question on Branches
>
> My question is
> a. should all these three branches be created on the main
> or
> b. Should we create a Features-Integration-Branch on main and Sub
> branches under Features-Integration-Branch for the Feature1 and
> Feature2.
I don't think it makes a huge amount of difference, though it's probably
easier in some respects to do the former.
I would suggest though that you consider, if you haven't already, the
case where you may have to re-create these branches after every
release.
In general I've found it rather difficult to use branches of the style
CVS provides to do feature integration, particularly if you've also got
a bunch of fixes to merge between release branches.
In the best case all features are all always fully integrated in the
baseline source and you control their availability with compiler or
runtime flags.
--
Greg A. Woods
+1 416 218-0098 VE3TCP <[EMAIL PROTECTED]> <robohack!woods>
Planix, Inc. <[EMAIL PROTECTED]>; Secrets of the Weird <[EMAIL PROTECTED]>
