Henri-Damien and I are currently working on cherry-picking commits from master back to 3.0.x to go into 3.0.4
You can see our progress here http://git.koha.org/cgi-bin/gitweb.cgi?p=koha-maintenance.git;a=summary We are not bringing new features, just bugfixes. I hope we can have this finished in the next few days and then get to testing. Having 2 feature branches going forward would just be way to much work to maintain. So leaving 3.0.x to its original purpose the stable maintenance branch and porting fixes to it is the safest and best route going forward. It does mean that Henri-Damien and I are working pretty hard at the moment to get the bug fxes cherry-picked back, and I thank Henri-Damien for all the work he has put in. But once we have done this, its just a matter of keeping on top of this in the future and cherry picking any applicable bugfixes as they are pushed up onto master. At least until the 3.2.x branch is created and it becomes Galen's problem to maintain the stable release :) Chris 2009/9/4 Bob Birchall @ Calyx <b...@calyx.net.au>: > To me it makes a lot of sense only to have bug fixes in 3.0.4 and all new > features in 3.2. > But what are the workload implications? > Bob > > > >> -----Original Message----- >> From: koha-devel-boun...@lists.koha.org > [mailto:koha-devel-boun...@lists.koha.org] On >> Behalf Of LAURENT Henri-Damien >> Sent: Thursday, 3 September 2009 10:41 PM >> To: koha-devel >> Subject: [Koha-devel] Reconciliation branch --mail à destination de la > communauté Besoin >> de ton aval >> >> Hi, >> After discussing in Yesterday's IRC meeting we have two options : >> a) test master AND reconciliation branch at about the same time which >> would double the work. But reconciliation branch could be already there >> (you can check it out from koha-maintenance/reconciliation) >> >> b) rework the reconciliation branch and come down to a simple bug fixing >> branch. >> Thus, we can expect 3.2 will be out on time. And 3.0.4 will contain only >> bugfixes and will be more stable but will take some overtime to make it. >> And we would have only one month to wait for all the enhanced contents, >> and only one version to test thoroughly. 3.0.x would include only bug >> fixes and would therfore respect the purpose of a stable branch. >> >> I have done some job on this reconciliation and I included much more >> than just bug fixes. But still, I would rather have something more >> stable and which fix problems than something likely to bring up (and >> doubles) problems. >> And I think that it would be sensible too. >> >> I wanted to give you the opportunity to speak your minds and tell what >> you want. >> -- >> Henri-Damien LAURENT >> Release Maintainer 3.0.x >> _______________________________________________ >> Koha-devel mailing list >> Koha-devel@lists.koha.org >> http://lists.koha.org/mailman/listinfo/koha-devel >> No virus found in this incoming message. >> Checked by AVG - www.avg.com >> Version: 8.5.409 / Virus Database: 270.13.75/2341 - Release Date: 09/02/09 > 18:03:00 > > _______________________________________________ > Koha-devel mailing list > Koha-devel@lists.koha.org > http://lists.koha.org/mailman/listinfo/koha-devel > _______________________________________________ Koha-devel mailing list Koha-devel@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-devel
