Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:88193
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
To: "'PHP internals'" <internals@lists.php.net>
Cc: "'Stanislav Malyshev'" <stas@php.net>,
	"'Julien Pauli'" <jpauli@php.net>,
	"'Ferenc Kovacs'" <tyrael@php.net>,
	"'Kalle Sommer Nielsen'" <kalle@php.net>
Date: Mon, 14 Sep 2015 22:43:09 +0200
Message-ID: <032b01d0ef2d$f9954320$ecbfc960$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
Thread-Index: AdDu22MixR9oxGXcSm6RmHdtfbTnaQ==
Content-Language: en-us
Subject: PHP-7.0 branched
From: anatol.php@belski.net ("Anatol Belski")

Hi,

As was announced a couple of months ago, PHP 7.0 should get its own branch
when PHP 5.4 goes EOL. 5.4 has reached its EOL today, thus PHP-7.0 was just
branched out.

This means,  it turns back to the usual commit workflow. As of now, any
patches targeting 7.0 have to be merged into PHP-7.0 and then into master.
In general, there are two commit flows for the normal bug fixing in the
active branches ATM

7.0 => master
5.6 => 7.0 => master

The documentation regarding the git process, as well as bugs.php.net and
lxr.php.net will be updated soon.

The NEWS file in master should contain the entries relevant for master only.
The entries relevant to PHP 7.0 should go into NEWS in the PHP-7.0 branch,
not into master anymore.

Regards

Anatol