Re: [!] Master merged into PHP-7.1
| From: | Yasuo Ohgaki | Date: | Thu, 13 Oct 2016 22:07:16 +0000 |
| Subject: | Re: [!] Master merged into PHP-7.1 | ||
| References: | 1 2 3 4 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-96357@lists.php.net to get a copy of this message | ||
On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kenttä <lauri.kentta@gmail.com> wrote:
> Actually I just followed the lines in the git graph:
>
> $ git log origin/PHP-7.1.0RC3 --oneline | head -n2
> 8fe9ea3 Update versions/dates for PHP 7.1.0RC3
> 36d5bed Merge branch 'PHP-7.0' into PHP-7.1
> -> 36d5bed is known to be good, and luckily it's not too old.
>
> $ git log origin/PHP-7.1 --oneline --graph
> -> searched for 36d5bed and followed up the PHP-7.1 line, which
> is the one with "Merge branch 'PHP-7.0' into PHP-7.1" commits,
> whereas the other branch has "Merge branch 'PHP-7.1'" commits.
>
> I suppose git when-merged 36d5bed would do the trick, too.
git-when-merged worked well.
MacBook-Pro:PHP-7.1 yohgaki$ git-when-merged -l 36d5bed
refs/heads/PHP-7.1 8ee842b0ea0d94035fe584ca8a3213902bf663b2
commit 8ee842b0ea0d94035fe584ca8a3213902bf663b2
Merge: 160832e 1bc3e1b
Author: Joe Watkins <krakjoe@php.net>
Date: Fri Sep 30 07:23:19 2016 +0100
Merge branch 'master' of https://github.com/php/php-src
MacBook-Pro:PHP-7.1 yohgaki$ git-when-merged --diff 36d5bed | wc -l
9596
It has almost 10k lines of diff, so this would be it.
Davey, please let us know when PHP-7.1 branch is ready for new commits.
I would like to add missing description in UPGRADING.
Thank you,
--
Yasuo Ohgaki
yohgaki@ohgaki.net