On Wed, Jan 31, 2007 at 10:45:44PM +0100, Martin Kersten wrote:
Stefan Manegold wrote:
On Wed, Jan 31, 2007 at 09:27:31PM +0000, Martin Kersten wrote:
Update of /cvsroot/monetdb/MonetDB5/src/mal In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31774
Modified Files: mal.mx mal_instruction.mx mal_resolve.mx Log Message: mal.mx mal_resolve.mx, website documentation
is the new website built for the development trunk or from the release branch? Niels knows. All of you too, copy.sh has
export WHICH=Stable
with the old website, it used to be the latter...
mal_instruction, protect against too many variables.
these were checked-in the development trunk, but the message sounds less like "new features" rather more like "bug fixes" --- aren't they also relevant for the release branch and a possible bugfix release?
Well that's a philosophical question that will challenge us forever. Yes, it solves a potential bug in the stable. No, it is new behaviour, because I didn't expected large programs.
Also, some bug fixes may involve many areas and quite some time, it puts us in the position to ask this question on a more or less daily basis. My position would be that bugfixes relate to official bugreports, the rest is the 'normal' evolution. Bugfixes then should 'somehow' be propagated to the stable and made available thru nightly builds.
A workable method is required, because people (starting with me) are definitely to forget to maintain two branches continously. Two branches isn't a lot to keep up with. Back porting and therefor manualy forwaring changes to the development branch is much more complicated!
So the rule is simple bug fixes (all) go to the release branch and all features go to the development branch Very clear ... Niels
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
-- Niels Nes, Centre for Mathematics and Computer Science (CWI) Kruislaan 413, 1098 SJ Amsterdam, The Netherlands room C0.02, phone ++31 20 592-4098, fax ++31 20 592-4312 url: http://www.cwi.nl/~niels e-mail: Niels.Nes@cwi.nl