Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:103832
MIME-Version: 1.0
References: <CAF+90c8itae3inWZ8W-1GSGFH7W03bzHuOOimkUjbEPMqTEVww@mail.gmail.com>
 <091debad-319d-7010-4852-fb9d7e6304ac@gmx.de> <CAJHtznxd7XoLH02a4Y4f5vfEbJX7GoJiwXtdGWpVSOkcXNTS9g@mail.gmail.com>
 <CAESVnVpSkjcpVGaCYrXeTHiHqTAoWEe+rxBZnpX+mRzYG2Ce2A@mail.gmail.com>
 <CAF+90c_WX8YiL-xHT3_S1HUjQtaP8BbDChZbmF-3V1gJpk9ZDQ@mail.gmail.com>
 <52d491a2-f546-f1eb-09e4-87f1b070d256@zend.com> <CAESVnVrfq-Q-Ai_FrU3h3xvzpL70RbJ1qDJALu2vk1pSSa485w@mail.gmail.com>
 <CAF+90c_US-1SHXB5MhxTpZ5Up0qGORHpn-gXwhSS-85hhR2FRQ@mail.gmail.com> <CAESVnVrz7V+BsD=5ARw1-Q8VCOi+hh19FXBGq-76Q11Z2F-rYw@mail.gmail.com>
In-Reply-To: <CAESVnVrz7V+BsD=5ARw1-Q8VCOi+hh19FXBGq-76Q11Z2F-rYw@mail.gmail.com>
Date: Thu, 24 Jan 2019 15:52:17 +0100
Message-ID: <CAF+90c_x=x-_XBu532r=mhBG2fPcEvQxyPY=H6=8vx7w5WSYUA@mail.gmail.com>
To: Sara Golemon <pollita@php.net>
Cc: Dmitry Stogov <dmitry@zend.com>, Zeev Suraski <zeev@php.net>, Christoph Becker <cmbecker69@gmx.de>, 
	PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="0000000000004ed3190580355c34"
Subject: Re: [PHP-DEV] Re: Branch off PHP-7.4 early
From: nikita.ppv@gmail.com (Nikita Popov)

--0000000000004ed3190580355c34
Content-Type: text/plain; charset="UTF-8"

On Fri, Nov 16, 2018 at 4:36 PM Sara Golemon <pollita@php.net> wrote:

> On Fri, Nov 16, 2018 at 9:26 AM Nikita Popov <nikita.ppv@gmail.com> wrote:
> > I feel like there may be some understanding here, because what
> > is proposed here seems to match exactly what you proposed
> > in your first mail to this thread.
> >
> Perhaps the impedance mismatch is in calling the branch "PHP-8".
> Calling it that says to me, "It's my responsibility to merge bugfixes
> if I want them propagated to what will become 8.0.0-final".  Calling
> it "feature/jit-and-other-cool-stuff" or literally ANYTHING other than
> "8" says, "Development is happening as normal, and the feature branch
> is the problem of the people working on the feature.
>
> Also, I'm going to quote again the specific language Dmitry used:
>
> > - in May/June move master into PHP-7.4, make PHP-8 to be master and
> > require committers to work on master and backport changes (according to
> > usual PHP/GIT workflow).
> >
> "move" says to me "rename the branches", which again, if fixes aren't
> being dutifully picked/merged/whatever to this branch, then they
> inevitably will get lost.  It's not that I don't trust someone working
> on the feature branch to do their best, it's that it shouldn't be
> their responsibility.
>
> -Sara
>

I'd like to bring this up again. Typed properties has been merged, so we
currently don't have any major code changes pending. To clarify what
exactly I'm proposing:

 * Create the PHP-7.4 branch now/soon, rather than in summer.
 * master will be PHP 8.0.
 * All changes are applied to the lowest applicable branch and then merged
up as usual, including to PHP-7.4 and master.
 * NEWS mentions for bug fixes are only added up to PHP-7.3. They are not
added on the PHP-7.4 branch, just like for master. (Excluding changes that
are only in 7.4/8.0, of course.)
 * All feature additions can generally still go to the PHP-7.4 branch,
there is no freeze.
 * Backwards incompatible changes and major internal API changes can go to
master (assuming they are accepted through the usual processes).

Nikita

--0000000000004ed3190580355c34--