Marc Delisle schrieb:
Michal Čihař a écrit :
Hi
On Fri, 20 Jan 2006 08:15:12 -0500 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
I think Sebastian's idea is to say that release 2.8.1 does not have more features than 2.8.0, only bugfixes. Critical bugfixes can still be named with -plX.
Okay, this sounds reasonable for me. But maybe then we could abandon those -plX as it just complicates versioning scheme.
So it's time to clarify the branch names.
HEAD would contain the new features + obviously all the bug fixes.
RELEASE_2_8_0 would contain ... 2.8.0, what a surprise!
Instead of having QA_2_8_0, we could name this branch QA_2_8. Into this one, we merge all the fixes that apply to the 2.8 series. When we feel it's ready, we release 2.8.1-rc1 from it (or directly 2.8.1 ?)
My only question is: what happens if we need to release something quickly? I guess we could start from QA_2_8 but then it would contain all the accumulated fixes for this branch. This is a case where a 2.8.0-pl1 (a quick patch applied to RELEASE_2_8_0) would be handy.
like here:
http://www.akhphd.au.dk/~bertho/cvsgraph/ http://cvs.m17n.org/~akr/cvstree/ http://www.cvs-ext.com/graph.gif