Re: [!] Master merged into PHP-7.1

From:	Lauri Kenttä	Date:	Thu, 13 Oct 2016 19:20:20 +0000
Subject:	Re: [!] Master merged into PHP-7.1
References:	1	Groups:	php.internals
Request:	Send a blank email to internals+get-96348@lists.php.net to get a copy of this message

On 2016-10-13 20:16, Davey Shafik wrote:

Can anyone shed some light on: 1) when it was merged 2) who merged it 3) how the dates are messed up

1) and 2) commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929 Merge: b0cacee 4b8bdac Author: Joe Watkins <krakjoe@php.net> Date: Mon Oct 10 12:17:11 2016 +0100

    Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1

The dates are "messed up" because, as the commit says, Joe merged php-src to his local branch (and not the other way around). So the date that you got refers to the commit which brought PHP-7.2 into Joe's messed-up branch. I think the normal approach here would be to issue a statement, rename this branch to PHP-7.1-broken-blahblah and restart PHP-7.1 from the last good commit (4b8bdac) with some cherry-picking or re-merging. -- Lauri Kenttä