Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96364
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> <028301d225a7$20292820$607b7860$@belski.net>
In-Reply-To: <028301d225a7$20292820$607b7860$@belski.net>
Date: Fri, 14 Oct 2016 04:25:12 +0200
Message-ID: <02ee01d225c2$33e16ba0$9ba442e0$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQLbzZO1yl4fvt2bP/TlJAz0d3Fu3QLYxvDmnn0IjAA=
Content-Language: en-us
Subject: RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
From: anatol.php@belski.net ("Anatol Belski")



> -----Original Message-----
> From: Anatol Belski [mailto:anatol.php@belski.net]
> Sent: Friday, October 14, 2016 1:11 AM
> To: 'Johannes Schl=C3=BCter' <johannes@php.net>; 'PHP internals list'
> <internals@lists.php.net>
> Cc: 'Davey Shafik' <davey@php.net>
> Subject: RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
>=20
>=20
>=20
> > -----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
> >
> > 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!
> >
> 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.
>=20
I've cherry-picked the missing commits into 7.1 and made initial empty =
merge 7.0=3D>7.1=3D>master. The state of PHP-7.1 should be now =
comparable to the state before the breach + missing patches. With this, =
the regular workflow is now restored so pushing/merging should go =
without issues.=20

I would explicitly ask Dmitry, Sara, Hui, Stas, Bob, Nikita and =
Christoph to check that all the code pushed after Monday 2016-10-10 =
13:11:45 is where it's expected to be. But also everyone else =
involved/interested - it would be a big help to double check, also with =
UPGRADING, NEWS, etc.

Davey, Joe, you will need to check NEWS, UPGRADING and possibly any =
other non code related files. Also, please keep in mind, that security =
patches are restored as well. The relevant NEWS are in the 7.0.12 tag.

Please let me know about any issues.

Regards

Anatol