Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:103437
MIME-Version: 1.0
References: <CAF+90c8itae3inWZ8W-1GSGFH7W03bzHuOOimkUjbEPMqTEVww@mail.gmail.com>
In-Reply-To: <CAF+90c8itae3inWZ8W-1GSGFH7W03bzHuOOimkUjbEPMqTEVww@mail.gmail.com>
Date: Thu, 15 Nov 2018 08:48:21 -0600
Message-ID: <CAESVnVrWfXDpoh4_LFPxG7Oa5nJrBELx0HC1r9yacFg6up84Qw@mail.gmail.com>
To: Nikita Popov <nikita.ppv@gmail.com>
Cc: PHP internals <internals@lists.php.net>
Content-Type: text/plain; charset="UTF-8"
Subject: Re: [PHP-DEV] Branch off PHP-7.4 early
From: pollita@php.net (Sara Golemon)

On Thu, Nov 15, 2018 at 8:28 AM Nikita Popov <nikita.ppv@gmail.com> wrote:
> Based on previous discussions, it appears that our current plan is to
> release PHP 8.0 after PHP 7.4. Normally we only branch off versions once
> they reach beta stage, which means the PHP-7.4 branch will only be created
> around summer 2019.
>
> I would like to propose to branch off PHP-7.4 earlier this time and start
> working on PHP 8.0 in the master branch. This will allow people to start
> working on changes that are not suitable for PHP 7.4 (due to either
> significant internal ABI breakage, or userland breakage).
>
> Because each new branch introduces a lot of merge overhead for
> contributors, I would further propose that merges should only go up to
> PHP-7.4, while merges into master (PHP 8) will be performed occasionally,
> on an as-needed basis, by the people working on it.
>
You seem to be describing a feature branch called "master".  How about
we do what we did with 7.0 which is to say we had php-ng on a feature
branch which was eventually merged to master, and had the 64bit branch
which was similarly merged in at the appropriate time.

The one thing which didn't work well at the time was that php-ng was
partially done in the dark which made the 64bit branch's merge less
optimal.  But as long as we're doing our feature branch development in
the open, this shouldn't be a problem.

-Sara