[Typo3-dev] bugfixes - how to update 3.6.0 ???

[Peter Niederlag]

Hi,

Kasper Skårhøj schrieb am  8.05.2004 um 11:49 Uhr CEST

> 
> > Some questions to clarify the release plan:
> 
> fine.
> 
> > 
> > Will an eventual 3.6.1 be based on the latest 3.6.0-x and start a
> > new cycle for 3.6.1-x?
> 
> If I understand right; no.
> Maintenance releases does NOT catch up with the HEAD branch
> development in CVS of course. Maintenance is maintenance. It is
> backports and otehr fixes for the release. But obviously any of those
> changes that are not temporary will be on the HEAD branch as well.
> Like a bugfix for instance.
> 
> 
> > 
> > What are the criteria to increase the package number and not only
> > the maintenace number?
> 
> As concluded by the other thread; we will figure that out when the
> release is ready. By default the third digit is increased for the
> dev-version in CVS. But before a release that might change since we
> cannot possibly know when starting a new dev-version what the finail
> version number might be (based on features).
> 
> So "3.6.1-dev" is the natural successor (in CVS) to "3.6.0" release.
> Lets say that we eventually figure that the next release justifies a
> jump to 4.0.0. Then - BEFORE ANNOUNCING anything - we just agree on
> this and in dev-CVS we increase to fx. "4.0.0b1".
> Thats my view.

---------------
what I think we have now
---------------

I would have thought that development in CVS after the release of
3.6.0-final takes place in MAIN/HEAD until there is some feature or
decision to split the development into another 3.6.x or
4.0.x branch. So prior to the next release which is not
maintanance/bugfix there should be a decision wether it is a 3.6.x,
3.x.x or 4.x.x, be branched in CVS and released as package with
appropriate names.

Bugfixes for 3.6.0 go into the "TYPO3_3-6-0" branch plus possibly
MAIN/HEAD. Once it is time to release a bugfixed version of 3.6.0 it
should be tagged in CVS as 3.6.0-bf1 (or some other prefix saying
bugfix, maintanance release or something) and released as packages
carrying possibly the same name as the CVS-Tag.

---------------
alternative idea?
---------------
since we even think abou raising major version to 4, we have still some
space available in 3.6 and upwards. So it might be a good idea
to let 3.6.0 stay as is and release maintanance/bugfix releases with
upgrading the last minor version. so first bugfix-release carries 3.6.1,
next bugfix 3.6.2, ...

advantage:
I think it is a lot more visible to users which version they are using,
which is quite important, when it comes to bugfixing etc. 

this probably would go with a branch "3.6" in CVS instead of a "3.6.0"
branch. 

-----------------------
conclusion
-----------------------
I would suggest to do the branches in CVS only be based on the first two
version digits(branch 4.x,3.x,etc). Each of these branches then gets
tagged for certain releases(3.x.y.rc1,3.x.y.rc2,3.x.y.final).

so we have:
* CVS(branches):
3.x
4.x
5.x
...

* CVS(tags):
3.x.y.postfix1
3.x.y.postfix2
3.x.y.final
..

* releaeses(packages):
3.x.y.postfix1
3.x.y [being related to 3.x.y.final tag in CVS]

* $GLOBAL['TYPO_VERSION']
carries the version from the package, that is
3.x.y.postfix, except for any final-versions which doesn't have a
postfix in package-names and $GLOBAL['TYPO_VERSION'] and corresponds to
3.x.y.final Tag in CVS.

Don't know if it makes sense this way...

Cheers,
PeterN
-- 
Peter Niederlag
http://www.niekom.de * Typo3 und EDV-Dienstleistungen *
http://www.clown-goli.de * Clown-Comedy-Jonglage-Animation *