On 21 ביול 2014, at 14:20, Ferenc Kovacs <tyr...@gmail.com> wrote:
> On Mon, Jul 21, 2014 at 1:10 PM, Nikita Popov <nikita....@gmail.com> wrote: > On Mon, Jul 21, 2014 at 9:31 AM, Zeev Suraski <z...@zend.com> wrote: > > > All, > > > > As we’re getting closer to release 5.6.0, and given the very high level of > > interest in phpng, I think it’s time for us to provide some clarity > > regarding what happens post 5.6.0. > > > > Dmitry and I wrote an RFC proposing that we merge phpng into master and > > turn it into the basis of the next major version of PHP (name TBD). > > > > The RFC is available at https://wiki.php.net/rfc/phpng > > > > There are actually two questions here: > 1. Do we want to base the next major version on phpng? > 2. Do we want to merge phpng into master? > > The latter is tied to the question whether or not we want to have a PHP 5.7 > release in the meantime. I'm not really sure whether or not that would be > good, I would recommend opening a separate thread about that question. > > either way, master should/will contain the changes from phpng, otherwise we > would go against to our current merge everything upwards git workflow. Agreed. > but that doesn't really a problem for 5.7, we should just branch it from 5.6 > (we wanted to do this for 5.6 and 5.5, but most of the changes in master at > that time was ok for a minor, so we branches from master instead of > cherrypicking everything.), as anything we want to backport from master to > 5.7 would require manual work to make it compatible with 5.7. Agreed too - I just think we should first focus on getting .NEXT released as soon as possible - and only branch away a 5.7 if we see it's taking too long. It's not a decision we need to take today, but if we were to do it, branching it from 5.6 sounds like the right way to do it. Zeev
