Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96362
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
To: =?utf-8?Q?'Johannes_Schl=C3=BCter'?= <johannes@php.net>,
	"'PHP internals list'" <internals@lists.php.net>
Cc: "'Davey Shafik'" <davey@php.net>
References: <1476398223.13824.1.camel@kuechenschabe>
In-Reply-To: <1476398223.13824.1.camel@kuechenschabe>
Date: Fri, 14 Oct 2016 01:11:23 +0200
Message-ID: <028301d225a7$20292820$607b7860$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQLbzZO1yl4fvt2bP/TlJAz0d3Fu3Z6TscCQ
Content-Language: en-us
Subject: RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
From: anatol.php@belski.net ("Anatol Belski")



> -----Original Message-----
> From: Johannes Schl=C3=BCter [mailto:johannes@php.net]
> Sent: Friday, October 14, 2016 12:37 AM
> To: PHP internals list <internals@lists.php.net>
> Cc: Davey Shafik <davey@php.net>; Anatol Belski =
<anatol.php@belski.net>
> Subject: [PHP-DEV] IMPORTANT: Git reset after wrong merge
>=20
> Hi,
>=20
> 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.
>=20
> 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)
>=20
> A backup of the bad tree is on
> https://github.com/johannes/php-src/tree/broken-5.7-20161014
>=20
> 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!
>=20
Yeah, we'll be checking to restore the missing 7.1 commits. Currently =
merges 7.0 to 7.1, or 7.1 to master, might have issues. I'd ask to =
please retain from pushing there, until the branch is restored. =
Hopefully this will happen at some point tomorrow.

Thanks

Anatol=20