Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:96357 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 29731 invoked from network); 13 Oct 2016 22:08:08 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 13 Oct 2016 22:08:08 -0000 Authentication-Results: pb1.pair.com smtp.mail=yohgaki@ohgaki.net; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=yohgaki@ohgaki.net; sender-id=pass Received-SPF: pass (pb1.pair.com: domain ohgaki.net designates 180.42.98.130 as permitted sender) X-PHP-List-Original-Sender: yohgaki@ohgaki.net X-Host-Fingerprint: 180.42.98.130 ns1.es-i.jp Received: from [180.42.98.130] ([180.42.98.130:51115] helo=es-i.jp) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id C3/A7-41968-6C500085 for ; Thu, 13 Oct 2016 18:08:08 -0400 Received: (qmail 87890 invoked by uid 89); 13 Oct 2016 22:08:03 -0000 Received: from unknown (HELO mail-qt0-f171.google.com) (yohgaki@ohgaki.net@209.85.216.171) by 0 with ESMTPA; 13 Oct 2016 22:08:03 -0000 Received: by mail-qt0-f171.google.com with SMTP id s49so59499612qta.0 for ; Thu, 13 Oct 2016 15:08:02 -0700 (PDT) X-Gm-Message-State: AA6/9RkzYg+xMQPkIIrqxL2Nv5cKz1tt6J5Z6/vFsq+bKMazmdNl4QaR6q3DN7bPL32o4jo3ToQfhnr/DtKEiQ== X-Received: by 10.237.47.194 with SMTP id m60mr9135208qtd.55.1476396476932; Thu, 13 Oct 2016 15:07:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.84.168 with HTTP; Thu, 13 Oct 2016 15:07:16 -0700 (PDT) In-Reply-To: References: <9a061b1cd6a4112c2cf2ef3ba24d0b71@koti.fimnet.fi> Date: Fri, 14 Oct 2016 07:07:16 +0900 X-Gmail-Original-Message-ID: Message-ID: To: =?UTF-8?Q?Lauri_Kentt=C3=A4?= Cc: Davey Shafik , "internals@lists.php.net" , Davey Shafik Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [PHP-DEV] [!] Master merged into PHP-7.1 From: yohgaki@ohgaki.net (Yasuo Ohgaki) On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kentt=C3=A4 = 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 8ee842b0ea0d94035fe584ca8a3213902bf6= 63b2 commit 8ee842b0ea0d94035fe584ca8a3213902bf663b2 Merge: 160832e 1bc3e1b Author: Joe Watkins 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