Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96358
Return-Path: <johannes@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 32286 invoked from network); 13 Oct 2016 22:37:21 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 13 Oct 2016 22:37:21 -0000
Authentication-Results: pb1.pair.com header.from=johannes@php.net; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=johannes@php.net; spf=unknown; sender-id=unknown
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 217.114.215.10 as permitted sender)
X-PHP-List-Original-Sender: johannes@php.net
X-Host-Fingerprint: 217.114.215.10 mail.experimentalworks.net  
Received: from [217.114.215.10] ([217.114.215.10:48139] helo=mail.experimentalworks.net)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 3A/08-41968-F9C00085 for <internals@lists.php.net>; Thu, 13 Oct 2016 18:37:20 -0400
Received: by mail.experimentalworks.net (Postfix, from userid 1003)
	id E6C1A4DED5; Fri, 14 Oct 2016 00:37:24 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	km31408.keymachine.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.0 required=4.0 tests=ALL_TRUSTED
	autolearn=unavailable autolearn_force=no version=3.4.0
X-Spam-HAM-Report: 
	* -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP
Received: from [192.168.2.34] (ppp-46-244-163-120.dynamic.mnet-online.de [46.244.163.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: johannes@schlueters.de)
	by mail.experimentalworks.net (Postfix) with ESMTPSA id C450F4DE88;
	Fri, 14 Oct 2016 00:37:22 +0200 (CEST)
Message-ID: <1476398223.13824.1.camel@kuechenschabe>
To: PHP internals list <internals@lists.php.net>
Cc: Davey Shafik <davey@php.net>, Anatol Belski <anatol.php@belski.net>
Date: Fri, 14 Oct 2016 00:37:03 +0200
Organization: php.net
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.10.4-0ubuntu2 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: IMPORTANT: Git reset after wrong merge
From: johannes@php.net (Johannes =?ISO-8859-1?Q?Schl=FCter?=)

Hi,

as Davey noted in the thread "Master merged into PHP-7.1" there was a
wrong merge in git. This wasn't noticed for a few days. This means we
had a few additional commits in between.

I've reseted PHP-7.1 to the *old* state *before* that merge. Quite a few
commits have been removed and need to be applied again (I hope Davey /
Anatol look after this)

A backup of the bad tree is on
https://github.com/johannes/php-src/tree/broken-5.7-20161014

When pushing please be careful that you are not pushing master again
into PHP-7.1. Please check your local trees carefully, commit
bce17764be6bd5ca43a512db51c030fb8d0437fd should NOT be in 7.1!

johannes