Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96371
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain pthreads.org from 74.125.82.51 cause and error)
MIME-Version: 1.0
In-Reply-To: <CAGa2bXb+qUTFgr0L-6q++rR5MbatkatqSpn_oO5q7e_GWDEVqw@mail.gmail.com>
References: <CANaX5ncmT-WpuZuBir=DuOYj6Uhw=uiTMYCf4XON-wd24r6HzA@mail.gmail.com>
 <9a061b1cd6a4112c2cf2ef3ba24d0b71@koti.fimnet.fi> <CANaX5nc9F=YtTfSioZRTWwh=8rPfn+3Gde7SVkDRTkfkAM6cug@mail.gmail.com>
 <f3f64cfb3b2bb8ada877ee9014911ea9@gmail.com> <CAGa2bXb+qUTFgr0L-6q++rR5MbatkatqSpn_oO5q7e_GWDEVqw@mail.gmail.com>
Date: Fri, 14 Oct 2016 15:26:48 +0100
Message-ID: <CAL=_i_mV+TQF1H30n64+kcCDwGNeWQbVi2zkeq9D3tLcoRhquA@mail.gmail.com>
To: Yasuo Ohgaki <yohgaki@ohgaki.net>
Cc: =?UTF-8?Q?Lauri_Kentt=C3=A4?= <lauri.kentta@gmail.com>, 
	Davey Shafik <davey@php.net>, "internals@lists.php.net" <internals@lists.php.net>, 
	Davey Shafik <me@daveyshafik.com>
Content-Type: multipart/alternative; boundary=001a114b3150419b22053ed40418
Subject: Re: [PHP-DEV] [!] Master merged into PHP-7.1
From: pthreads@pthreads.org (Joe Watkins)

--001a114b3150419b22053ed40418
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Afternoon all,

    urm ... sorry, I'm so terrible at git ...

Cheers
Joe

On Thu, Oct 13, 2016 at 11:07 PM, Yasuo Ohgaki <yohgaki@ohgaki.net> wrote:

> On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kentt=C3=A4 <lauri.kentta@gmail.co=
m>
> 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                     8ee842b0ea0d94035fe584ca8a3213
> 902bf663b2
> 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
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--001a114b3150419b22053ed40418--