On Wed, Jun 24, 2015 at 10:03 PM, Julien Pauli <jpa...@php.net> wrote:
> Well, as our release is based on our RC, with no more commits except > security or failing test fixes; normally nothing more should be commited to > 5.5 by now. > > However, if you were working on a patch that is included in the RC, but > you got some improvements to bring, of course it can still get in, I should > cherry pick them from 5.6. > Nothing should go to 5.5 by now, we are entering security-only. Also, if > some security patches show up, they'll get cherry picked to 5.5.27 > > I dont know if it's the best way of doing thing though, I included Ferenc > to the conversation so he can bring an advice. > > Thank you > > Julien Pauli > > > hi, sorry, it seemed that I missed this email originally. for the record, back in jun Julien asked me to restrict pushes for the 5.4 and 5.5 branches as he was preparing the last 5.5 release before going to the extended support and he also assumed that 5.5 goes eol in the same month so he wanted to make sure that people don't commit bugfixes/features into 5.4/5.5 by accident. Now that 5.4 is almost EOLd (based on the latest release announcement worst case is October, which makes it 5-6 months longer support than the originally planned/announced 3 years) we can all agree that pushes to 5.4 should be kept restricted. About 5.5 I'm more open for arguments, Stas was fine with having PHP-5.4 open and people were also honoring to not push stuff there without discussing with him beforehand, plus we always have a release branch to tag releases, so even if somebody pushes something nasty into PHP-5.5 that's not a blocker for tagging an RC/release. Maybe he felt reverting a commit from 5.6 while merging up but not actually reverting it from the upper branches is too much of a PITA, so he wanted to prevent it from happening on the first place. Personally for 5.6 I think I wouldn't restrict people from pushing as I think that at that time it will take me less time to revert one or two accidental commits than it would take me to merge/cherrypick everything myself. But I think that each RM has the right to decide to restrict the pushes if he/she wants to after the given version goes into extended support/security fixes only so if Julien wants to keep this way I'm fine with it. ps: afair Julien is still on vacation this week, so give him some time to reply.
