Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:96348 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 583 invoked from network); 13 Oct 2016 19:20:46 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 13 Oct 2016 19:20:46 -0000 Authentication-Results: pb1.pair.com smtp.mail=lauri.kentta@gmail.com; spf=softfail; sender-id=softfail Authentication-Results: pb1.pair.com header.from=lauri.kentta@gmail.com; sender-id=softfail Received-SPF: softfail (pb1.pair.com: domain gmail.com does not designate 188.117.41.47 as permitted sender) X-PHP-List-Original-Sender: lauri.kentta@gmail.com X-Host-Fingerprint: 188.117.41.47 mailgateway.locotech.fi Linux 2.6 Received: from [188.117.41.47] ([188.117.41.47:38185] helo=mailgateway.locotech.fi) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id C0/C1-41968-C8EDFF75 for ; Thu, 13 Oct 2016 15:20:45 -0400 Received: from localhost (mailgateway [127.0.0.1]) by mailgateway.locotech.fi (Postfix) with ESMTP id B1CEEA35F03; Thu, 13 Oct 2016 22:20:41 +0300 (EEST) X-Virus-Scanned: amavisd-new at locotech.fi X-Spam-Flag: NO X-Spam-Score: -1.998 X-Spam-Level: X-Spam-Status: No, score=-1.998 tagged_above=-9998 required=5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, NML_ADSP_CUSTOM_MED=0.9] autolearn=no autolearn_force=no Received: from mailgateway.locotech.fi ([127.0.0.1]) by localhost (mailgateway.locotech.fi [127.0.0.1]) (amavisd-new, port 10024) with LMTP id QkfjNMrPgtvR; Thu, 13 Oct 2016 22:20:25 +0300 (EEST) Received: from posti.fimnet.fi (posti.fimnet.fi [172.16.1.44]) by mailgateway.locotech.fi (Postfix) with ESMTP id 88E38A35ED5; Thu, 13 Oct 2016 22:20:25 +0300 (EEST) Received: from k-piste.dy.fi (unknown [172.16.1.39]) by posti.fimnet.fi (Postfix) with ESMTPSA id 4C85B101C86; Thu, 13 Oct 2016 22:20:25 +0300 (EEST) Received: from localhost.localdomain ([::1] helo=k-piste.dy.fi) by k-piste.dy.fi with esmtp (Exim 4.87) (envelope-from ) id 1bulYD-0002ud-0s; Thu, 13 Oct 2016 22:20:21 +0300 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 13 Oct 2016 22:20:20 +0300 To: Davey Shafik Cc: internals@lists.php.net, me@daveyshafik.com In-Reply-To: References: Message-ID: <9a061b1cd6a4112c2cf2ef3ba24d0b71@koti.fimnet.fi> X-Sender: lauri.kentta@gmail.com User-Agent: Roundcube Webmail/1.2.2 Subject: Re: [PHP-DEV] [!] Master merged into PHP-7.1 From: lauri.kentta@gmail.com (=?UTF-8?Q?Lauri_Kentt=C3=A4?=) 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 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ä