Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:72335
Return-Path: <tjerk.meesters@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 67886 invoked from network); 6 Feb 2014 13:02:35 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 6 Feb 2014 13:02:35 -0000
Authentication-Results: pb1.pair.com smtp.mail=tjerk.meesters@gmail.com; spf=pass; sender-id=pass
Authentication-Results: pb1.pair.com header.from=tjerk.meesters@gmail.com; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.160.48 as permitted sender)
X-PHP-List-Original-Sender: tjerk.meesters@gmail.com
X-Host-Fingerprint: 209.85.160.48 mail-pb0-f48.google.com  
Received: from [209.85.160.48] ([209.85.160.48:36011] helo=mail-pb0-f48.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 48/30-00209-7E783F25 for <internals@lists.php.net>; Thu, 06 Feb 2014 08:02:32 -0500
Received: by mail-pb0-f48.google.com with SMTP id rr13so1721291pbb.35
        for <internals@lists.php.net>; Thu, 06 Feb 2014 05:02:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=references:mime-version:in-reply-to:content-type
         :content-transfer-encoding:message-id:cc:from:subject:date:to;
        bh=xV4PLWSqCtboyFPUjwYJPiaeZWR9EiLWIkXdCwi0ctk=;
        b=g/a34lLAOTZJfEXKH8LlLE2kFgur7i6bNk5GcPwsEm2uAngcQpEkzQjKXeRgx4oGMR
         IQD4wbf9bT1b1cd/AUqj0VUI4+7b5tQIk3WANzJfW6gcbqo91h/W9Fc+2svmWxjdlgZp
         BOfa5jA3luDIaX2XXUcWWCEfWr8DaZopncBaSAoI1l62wa3qNpiVKqmWFQborUNOn4i7
         LYXLkyme4+it5Yr31bSfQ76HLG6/rCFj9cICvjDYcz3WTjuIHJltGve4lWuX5JQPr6lX
         ITOt4WD0+5W+UpPOA6htLf2qtDXv1hdEnrP6Z8cdbDMzRAcXsexi9rNipxZ5ZRVHAuMM
         Wdiw==
X-Received: by 10.69.20.139 with SMTP id hc11mr12384521pbd.63.1391691748251;
        Thu, 06 Feb 2014 05:02:28 -0800 (PST)
Received: from [192.168.1.104] (bb121-7-198-24.singnet.com.sg. [121.7.198.24])
        by mx.google.com with ESMTPSA id ug2sm6533269pac.21.2014.02.06.05.02.25
        for <multiple recipients>
        (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
        Thu, 06 Feb 2014 05:02:26 -0800 (PST)
References: <BLU0-SMTP209547FB3447EFE70B7D4D0E2940@phx.gbl> <CAH-PCH5MzH9Sd2UfLhbKg2RnuX+51_hovQ4Ut7gcZVD=gRdULw@mail.gmail.com> <CAH-PCH5KXVK9H=8qFg9kq3whKAP4NvORqCWCbjUJz47K4KSN3A@mail.gmail.com> <CAH-PCH61MyWbuKWp0RKHTYRwq63UKSocvF=oYEpPTUEoWrf8ww@mail.gmail.com>
Mime-Version: 1.0 (1.0)
In-Reply-To: <CAH-PCH61MyWbuKWp0RKHTYRwq63UKSocvF=oYEpPTUEoWrf8ww@mail.gmail.com>
Content-Type: text/plain;
	charset=gb2312
Content-Transfer-Encoding: quoted-printable
Message-ID: <A1CCA270-39CD-4B64-8FA4-9A09F39B8731@gmail.com>
Cc: Bob Weinand <bobwei9@hotmail.com>,
 =?GB2312?Q?Johannes_Schl=A8=B9ter?= <johannes@php.net>,
 List PHP Mailing List <internals@lists.php.net>
X-Mailer: iPhone Mail (11B554a)
Date: Thu, 6 Feb 2014 21:02:22 +0800
To: Ferenc Kovacs <tyra3l@gmail.com>
Subject: Re: [PHP-DEV] NEWS and UPGRADING files in PHP-5.6
From: tjerk.meesters@gmail.com (Tjerk Meesters)

Hi Ferenc,

> On 6 Feb, 2014, at 7:13 pm, Ferenc Kovacs <tyra3l@gmail.com> wrote:
>=20
>> On Thu, Feb 6, 2014 at 11:31 AM, Ferenc Kovacs <tyra3l@gmail.com> wrote:
>>=20
>>=20
>>=20
>>=20
>>> On Thu, Feb 6, 2014 at 10:02 AM, Ferenc Kovacs <tyra3l@gmail.com> wrote:=

>>>=20
>>>=20
>>>=20
>>>=20
>>>> On Thu, Feb 6, 2014 at 9:53 AM, Bob Weinand <bobwei9@hotmail.com> wrote=
:
>>>>=20
>>>> These two files in PHP-5.6 branch actually are the same than master.
>>>>=20
>>>> I just noticed that when I wanted to write about the merge of pow
>>>> operator RFC=A1=AD
>>>>=20
>>>> Could someone please fix that one?
>>>>=20
>>>> Bob
>>>> --
>>>> PHP Internals - PHP Runtime Development Mailing List
>>>> To unsubscribe, visit: http://www.php.net/unsub.php
>>> from a quick look it seems that your last merge caused it, will revert
>>> it, if nobody beats me to it.
>>>=20
>>> --
>>> Ferenc Kov=A8=A2cs
>>> @Tyr43l - http://tyrael.hu
>>=20
>> yep, it seems that you've merged a branch/PR which was originally branche=
d
>> from master.
>> in the past when similar thing happened we always reset the head before
>> the merge and then force push it.
>> I don't have karma for that, but I can grant myself if nobody around
>> (johannes?)
>>=20
>> --
>> Ferenc Kov=A8=A2cs
>> @Tyr43l - http://tyrael.hu
>=20
>=20
> Hi,
>=20
> I've restored the tip of the PHP-5.6 and master branch to where it was
> before the merge.
> The branch which holds the wrong merge is available here:
> http://git.php.net/?p=3Dphp-src.git;a=3Dshortlog;h=3Drefs/heads/broken-5.6=
-20140206
> If you pulled between the wrong merge and the fix (~2 hours of timeframe),=

> then you have to put your local 5.6 and master branch aside and reset thos=
e
> to the origin and cherrypick your local changes if you have any.
> Bob: please rebase/cherrypick your changes to the PHP-5.6 branch first, an=
d
> merge that upwards to master, otherwise you will bring along the other
> commits from the master branch.

Thanks. Was there something I should have done differently with my PR or are=
 branches off master okay?

>=20
> --=20
> Ferenc Kov=A8=A2cs
> @Tyr43l - http://tyrael.hu