Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:99566
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.83.50 as permitted sender)
To: PHP Internals <internals@lists.php.net>
Message-ID: <b034879a-d6df-319f-6666-1a7a8f85a0b2@gmail.com>
Date: Mon, 19 Jun 2017 17:58:56 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:52.0)
 Gecko/20100101 Thunderbird/52.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Missing commits in 7.0 branch
From: smalyshev@gmail.com (Stanislav Malyshev)

Hi!

I've discovered something weird in 7.0 branch. There are two commits of
a bugfix -
https://github.com/php/php-src/commit/d1d002fc4dd25a80e20163b18880f40a445276e7
and
https://github.com/php/php-src/commit/8c44d07fd485a8e8d62bc6e4fe14bec5493ebc58
- 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.

Thanks,
-- 
Stas Malyshev
smalyshev@gmail.com