Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:99573
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain schlueters.de from 84.19.169.162 cause and error)
Message-ID: <1497965498.2771.2.camel@schlueters.de>
To: Stanislav Malyshev <smalyshev@gmail.com>, PHP Internals
	 <internals@lists.php.net>
Date: Tue, 20 Jun 2017 15:31:38 +0200
In-Reply-To: <b034879a-d6df-319f-6666-1a7a8f85a0b2@gmail.com>
References: <b034879a-d6df-319f-6666-1a7a8f85a0b2@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [PHP-DEV] Missing commits in 7.0 branch
From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=)

On Mo, 2017-06-19 at 17:58 -0700, Stanislav Malyshev wrote:
> Hi!
> 
> I've discovered something weird in 7.0 branch. There are two commits
> of
> a bugfix -
> https://github.com/php/php-src/commit/d1d002fc4dd25a80e20163b18880f40
> a445276e7
> and
> https://github.com/php/php-src/commit/8c44d07fd485a8e8d62bc6e4fe14bec
> 5493ebc58
> - which I made, which are present in 7.1 and master. However, they
> were
> made for 7.0 branch (as merge commit in 7.1 shows) - but there is no
> trace of it in 7.0. I am trying to figure out why is that and what
> happened to it in 7.0 - is it my mess-up or somehow it was removed?
> 
> If nobody knows what happened, I'd assume I just messed it up and
> forgot
> to push into 7.0, and will re-add them, but I want to be sure just in
> case I forgot or misunderstood something.

From the history it looks like you didn't push the 7.0 branch. 

See also the commit mail which only references 7.1 and master.
http://news.php.net/php.cvs/96748

johannes