Everything

php

Missing commits in 7.0 branch

php.internals

Stas Malyshev

9 years ago

Hi!

I've discovered something weird in 7.0 branch. There are two commits of
a bugfix -
https://github.com/php/php-src/commit/d1d002fc4dd25a80e20163b18880f40a445276e7
and
https://github.com/php/php-src/commit/8c44d07fd485a8e8d62bc6e4fe14bec5493ebc58
- which I made, which are present in 7.1 and master. However, they were
made for 7.0 branch (as merge commit in 7.1 shows) - but there is no
trace of it in 7.0. I am trying to figure out why is that and what
happened to it in 7.0 - is it my mess-up or somehow it was removed?

If nobody knows what happened, I'd assume I just messed it up and forgot
to push into 7.0, and will re-add them, but I want to be sure just in
case I forgot or misunderstood something.

Thanks,

--
Stas Malyshev
smalyshev@gmail.com

Johannes Schlueter

9 years ago

On Mo, 2017-06-19 at 17:58 -0700, Stanislav Malyshev wrote:

> Hi!
>
> I've discovered something weird in 7.0 branch. There are two commits
> of
> a bugfix -
> https://github.com/php/php-src/commit/d1d002fc4dd25a80e20163b18880f40
> a445276e7
> and
> https://github.com/php/php-src/commit/8c44d07fd485a8e8d62bc6e4fe14bec
> 5493ebc58
> - which I made, which are present in 7.1 and master. However, they
> were
> made for 7.0 branch (as merge commit in 7.1 shows) - but there is no
> trace of it in 7.0. I am trying to figure out why is that and what
> happened to it in 7.0 - is it my mess-up or somehow it was removed?
>
> If nobody knows what happened, I'd assume I just messed it up and
> forgot
> to push into 7.0, and will re-add them, but I want to be sure just in
> case I forgot or misunderstood something.

From the history it looks like you didn't push the 7.0 branch. 

See also the commit mail which only references 7.1 and master.
http://news.php.net/php.cvs/96748

johannes

Stas Malyshev

9 years ago

Hi!

> From the history it looks like you didn't push the 7.0 branch.
>
> See also the commit mail which only references 7.1 and master.
> http://news.php.net/php.cvs/96748

Ok, I've re-added them to 7.0 and pushed it. Anatol, could you also add
these to the release branch so that 7.0 would be in sync with 7.1 sooner?

Thanks,

--
Stas Malyshev
smalyshev@gmail.com

Anatol Belski

9 years ago

Hi Stas,

> -----Original Message-----
> From: Stanislav Malyshev [mailto:smalyshev@gmail.com]
> Sent: Tuesday, June 20, 2017 10:33 PM
> To: Johannes Schlüter <johannes@schlueters.de>; PHP Internals
> <internals@lists.php.net>; Anatol Belski <anatol.php@belski.net>
> Subject: Re: [PHP-DEV] Missing commits in 7.0 branch
>
> Hi!
>
> > From the history it looks like you didn't push the 7.0 branch.
> >
> > See also the commit mail which only references 7.1 and master.
> > http://news.php.net/php.cvs/96748
>
> Ok, I've re-added them to 7.0 and pushed it. Anatol, could you also add these to
> the release branch so that 7.0 would be in sync with 7.1 sooner?
>

Clear, given it's already a released piece, it should be ok. I'll put those commits into 7.0.21.

Regards

Anatol