Re: Branching PHP-5.5

hi, On Fri, Nov 2, 2012 at 1:49 PM, Kalle Sommer Nielsen <kalle@php.net> wrote: > Hi David >> it's been a while since we started talking about PHP 5.5 and we are >> already a little bit late with my release plans. I've started reviewing >> the current master and came to the conclusion that it does make more >> sense to me to branch 5.5 of master for a few reasons: >> > > It's been a while since I contributed anything to the core, however I > remember what a mess it was to cross merge back in the CVS days and I > honestly do not see a big reason to make a "bigger" mess by branching yet > another version, I think we can easily cope with having 5.5 as the current > master branch like we did with the original 6.0 so until 5.4 is gonna > "retire" or go into security fixes only mode like 5.3 currently is, then I > think it makes a little sense to do so. > > Now I realize that we are trying to speed up releases and I probably > skipped a few discussions which will render my mail here void, but until > 5.4 is in "security-fixes-only" mode then I think 5.5 should remain as the > current master. There is no question about 5.5 having its own branch or not, only when it has be done. And as 5.5 exists as of its 1st release, a branch is needed. Master remains the main development branch. Also git makes merges easier, most of the time. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org