Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:72337
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.44 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <A1CCA270-39CD-4B64-8FA4-9A09F39B8731@gmail.com>
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>
	<A1CCA270-39CD-4B64-8FA4-9A09F39B8731@gmail.com>
Date: Thu, 6 Feb 2014 14:16:14 +0100
Message-ID: <CAH-PCH6t04ji4=-ypWOxiADnd-MBT34vgpHqXphj48vsc1oTTg@mail.gmail.com>
To: Tjerk Meesters <tjerk.meesters@gmail.com>
Cc: Bob Weinand <bobwei9@hotmail.com>, =?UTF-8?Q?Johannes_Schl=C3=BCter?= <johannes@php.net>, 
	List PHP Mailing List <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a11c309ea8d01d004f1bcade4
Subject: Re: [PHP-DEV] NEWS and UPGRADING files in PHP-5.6
From: tyra3l@gmail.com (Ferenc Kovacs)

--001a11c309ea8d01d004f1bcade4
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 6, 2014 at 2:02 PM, Tjerk Meesters <tjerk.meesters@gmail.com>wr=
ote:

> Hi Ferenc,
>
> > On 6 Feb, 2014, at 7:13 pm, Ferenc Kovacs <tyra3l@gmail.com> wrote:
> >
> >> 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 rever=
t
> >>> 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
> branched
> >> from master.
> >> in the past when similar thing happened we always reset the head befor=
e
> >> 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.
>
> Thanks. Was there something I should have done differently with my PR or
> are branches off master okay?
>
> >
> > --
> > Ferenc Kov=C3=A1cs
> > @Tyr43l - http://tyrael.hu
>

Yeah, the problem was that the PR was targeted to master (as you can see at
https://github.com/php/php-src/pull/543), while the RFC targeted 5.6 (
https://wiki.php.net/rfc/pow-operator#proposed_php_version_s)
Ofc. the person doing the merge could have realized this and either rebase
himself, or ask you to send another PR, but next time make sure that you
base the PR on the correct branch.

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--001a11c309ea8d01d004f1bcade4--