Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:72334
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.172 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAH-PCH5KXVK9H=8qFg9kq3whKAP4NvORqCWCbjUJz47K4KSN3A@mail.gmail.com>
References: <BLU0-SMTP209547FB3447EFE70B7D4D0E2940@phx.gbl>
	<CAH-PCH5MzH9Sd2UfLhbKg2RnuX+51_hovQ4Ut7gcZVD=gRdULw@mail.gmail.com>
	<CAH-PCH5KXVK9H=8qFg9kq3whKAP4NvORqCWCbjUJz47K4KSN3A@mail.gmail.com>
Date: Thu, 6 Feb 2014 12:13:56 +0100
Message-ID: <CAH-PCH61MyWbuKWp0RKHTYRwq63UKSocvF=oYEpPTUEoWrf8ww@mail.gmail.com>
To: Bob Weinand <bobwei9@hotmail.com>, =?UTF-8?Q?Johannes_Schl=C3=BCter?= <johannes@php.net>
Cc: List PHP Mailing List <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a11c309ea27360b04f1baf8b1
Subject: Re: [PHP-DEV] NEWS and UPGRADING files in PHP-5.6
From: tyra3l@gmail.com (Ferenc Kovacs)

--001a11c309ea27360b04f1baf8b1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 6, 2014 at 11:31 AM, Ferenc Kovacs <tyra3l@gmail.com> wrote:

>
>
>
> On Thu, Feb 6, 2014 at 10:02 AM, Ferenc Kovacs <tyra3l@gmail.com> wrote:
>
>>
>>
>>
>> On Thu, Feb 6, 2014 at 9:53 AM, Bob Weinand <bobwei9@hotmail.com> wrote:
>>
>>> These two files in PHP-5.6 branch actually are the same than master.
>>>
>>> I just noticed that when I wanted to write about the merge of pow
>>> operator RFC=E2=80=A6
>>>
>>> Could someone please fix that one?
>>>
>>> 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.
>>
>> --
>> Ferenc Kov=C3=A1cs
>> @Tyr43l - http://tyrael.hu
>>
>
> 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?)
>
> --
> Ferenc Kov=C3=A1cs
> @Tyr43l - http://tyrael.hu
>


Hi,

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 those
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, and
merge that upwards to master, otherwise you will bring along the other
commits from the master branch.

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--001a11c309ea27360b04f1baf8b1--