> Thu Dec 17 2009 10:15:11 AM EST from IGnatius T Foobar @ Uncensored >Subject: 7.70 release > > > >Yes, we should continue to make use of release branches. I just don't want >them to live *too* long. We'll keep stable-77x around for backports of bug >fixes if that's the release that makes it into Debian stable, of course. > >I think what I'm trying to say here is that we should never let svn head get >"very" unstable. We did that last year and by the time we got it finished, >there were so many bugs in it that we didn't catch in our own testing, that >it became quite a setback to get it stable again. > >
I prefer not to have release branches. I'll clarify, if we release we should "tag" the release. OK thats actually a branch but lets just think of it as a tag. Every release tag should be just the TRUNK HEAD. After the release we just put bug fixes in TRUNK HEAD Development should take place in a branch, merging bug fixes from TRUNK into the branch until such time that the branch is stable enough to become a release when it is merged into TRUNK and TAGed as a release. That way the following should be true at all times HEAD of TRUNK is stable. Any branch is unstable We can each have a branch to work on different features and are each responsible for keeping our branch in line with TRUNK HEAD Merging development branches together becomes a nightmare for the last person to merge into TRUNK :-) >From the point of view of the rest of the world (our target audience) that has got to be the best approach.
