On Fri, May 25, 2001 at 10:36:51AM -0700, Ian Clarke wrote: > On Fri, May 25, 2001 at 10:32:19AM -0700, Mr. Bad wrote: > > I'm going to start beta-testing 0.4 this wknd. > > > > How confident are oh-point-four-ers that it's getting to be time to > > merge 0.4 back from experimental into the main trunk? > > Hmmm, we could do this, and move further improvements to 0.3 to the > stable branch (I doubt 0.3.9.1 will be the last 0.3 release). > > The only question is - what do we put in the experimental branch without > 0.4?!?!?!?! Scary. (Doh - 0.5 of course).
What we should do is branch the current HEAD to "0.3", then merge experimental to HEAD. Then the main branches would be stable, 0.3, and HEAD, and stable would track 0.3. At some point we'd branch HEAD as 0.4 and stable would start to track 0.4. etc. The point is, the cutting-edge development should always be in HEAD, that's the way CVS is meant to work. What we're doing now is ass backwards. -- # tavin cole # # "Technology is a way of organizing the universe so that # man doesn't have to experience it." # # - Max Frisch _______________________________________________ Devl mailing list Devl at freenetproject.org http://lists.freenetproject.org/mailman/listinfo/devl
