Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge

[Christoph M. Becker]

On 14.10.2016 at 04:25, Anatol Belski wrote:

> 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.

My commits are in all branches where they are supposed to be.  Also NEWS
and UPGRADING is correct (I had to re-commit a single NEWS entry).

-- 
Christoph M. Becker

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

[Anatol Belski]

Hi Yasuo,

> -Original Message-
> From: Yasuo Ohgaki [mailto:yohg...@ohgaki.net]
> Sent: Friday, October 14, 2016 4:08 AM
> To: Anatol Belski <anatol@belski.net>
> Cc: Johannes Schlüter <johan...@php.net>; PHP internals list
> <internals@lists.php.net>; Davey Shafik <da...@php.net>
> Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge
> 
> Hi Anatol,
> 
> On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski <anatol@belski.net> wrote:
> > 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.
> 
> I already pushed UPGRADING. This should be harmless.
> I'll retain other changes, if any.
> 
Many thanks for checking. It went faster than I thought, so it should be 
already possible to push an do the merges. Though it'd not hurt to check 
everything is in order before. So I'd make sense to wait like half a day or so 
for everyone to look over the branch before starting with some "heavy" things :)

Thanks

Anatol



--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

[Anatol Belski]

> -Original Message-
> From: Anatol Belski [mailto:anatol@belski.net]
> Sent: Friday, October 14, 2016 1:11 AM
> To: 'Johannes Schlüter' <johan...@php.net>; 'PHP internals list'
> <internals@lists.php.net>
> Cc: 'Davey Shafik' <da...@php.net>
> Subject: RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
> 
> 
> 
> > -Original Message-
> > From: Johannes Schlüter [mailto:johan...@php.net]
> > Sent: Friday, October 14, 2016 12:37 AM
> > To: PHP internals list <internals@lists.php.net>
> > Cc: Davey Shafik <da...@php.net>; Anatol Belski
> > <anatol@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.
> 
I've cherry-picked the missing commits into 7.1 and made initial empty merge 
7.0=>7.1=>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. 

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





--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge

[Yasuo Ohgaki]

Hi Anatol,

On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski  wrote:
> 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.

I already pushed UPGRADING. This should be harmless.
I'll retain other changes, if any.

Regards,

--
Yasuo Ohgaki
yohg...@ohgaki.net

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge

[Anatol Belski]

> -Original Message-
> From: Johannes Schlüter [mailto:johan...@php.net]
> Sent: Friday, October 14, 2016 12:37 AM
> To: PHP internals list <internals@lists.php.net>
> Cc: Davey Shafik <da...@php.net>; Anatol Belski <anatol....@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.

Thanks

Anatol 


--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DEV] IMPORTANT: Git reset after wrong merge

[Johannes Schlüter]

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



-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php