Hi all, Now that the changes that had been placed in stable have been merged back in to the trunk and the trunk has been cleaned up significantly we need to decide what we're going to do about the stable branch.
The way I see it we have three options: 1) Keep things the way they are with both stable and trunk with people developing directly on trunk (this will involve rebranching stable from trunk). 2) Get rid of stable, and have alpha.libre.fm point to trunk. Then insist that everyone do their development locally, pushing to their own branch and then request merges from the core developers when their code is finished. (This will involve making the local installation process easier by providing example data to get people started) 3) A mixture of the two, keep stable and force local development for trunk. Personally I favor option 2 for the following reasons: * Stable and trunk both run from the same database with the current setup, this makes changes requiring database restructuring difficult. * It would force us to get the installation script up-to-date and make local development easier to setup (making it much easier for people who don't have commit access to contribute). * By only having changes worked on in branches and then merged to trunk by the core team we can perform an easy review of all changes. * Last but by no means least, this would prevent the recurrence of the unfortunate situation whereby someone commits changes directly to stable making it a pain to merge them back in to the trunk. Cheers, Mike. _______________________________________________ Libre-fm mailing list [email protected] http://lists.autonomo.us/mailman/listinfo/libre-fm
