Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:72340 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 78363 invoked from network); 6 Feb 2014 14:14:28 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 6 Feb 2014 14:14:28 -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.220.176 as permitted sender) X-PHP-List-Original-Sender: tjerk.meesters@gmail.com X-Host-Fingerprint: 209.85.220.176 mail-vc0-f176.google.com Received: from [209.85.220.176] ([209.85.220.176:45033] helo=mail-vc0-f176.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 96/42-00209-3C893F25 for ; Thu, 06 Feb 2014 09:14:27 -0500 Received: by mail-vc0-f176.google.com with SMTP id la4so1434396vcb.7 for ; Thu, 06 Feb 2014 06:14:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=IjyibM++O+e+CN7+DAQvjUb1DlR7PyHKS0tLzUbyEJ0=; b=jowCyesMIpxi7DWf4qGpQAY97rnQo4IET/oTI9bPzkADJdSNdkxNndSDE+HT2i6azg WZnngbaSg9EtO8WPT+oI1aIe/VRxGWD8kTDBpIMJjY+oFuUifuabvPY24Vden6XACI5v 614hs1hiuMpyE744hPgbYm5vvdH1vcS8ALtLvNwyUIHtXOe8+tzAkjsxKC5fgmfyFIUJ g1jb9+SnEbYeduIWFM3O4ug7tlGCjhkSyrtryx9xmsdalS+pb2UI8uQ6HQP5yUHJLUUo qreyUVWGdDbj5YxT4v1gibr3aBBoQ+MEPpFgQWBND1tZBEN3GB1NC2CEASaITB6yEpf9 M5gg== MIME-Version: 1.0 X-Received: by 10.58.37.67 with SMTP id w3mr5926312vej.22.1391696063682; Thu, 06 Feb 2014 06:14:23 -0800 (PST) Received: by 10.58.133.229 with HTTP; Thu, 6 Feb 2014 06:14:23 -0800 (PST) In-Reply-To: References: Date: Thu, 6 Feb 2014 22:14:23 +0800 Message-ID: To: Ferenc Kovacs Cc: Bob Weinand , =?ISO-8859-1?Q?Johannes_Schl=FCter?= , List PHP Mailing List Content-Type: multipart/alternative; boundary=089e013a0d4282e04204f1bd7d54 Subject: Re: [PHP-DEV] NEWS and UPGRADING files in PHP-5.6 From: tjerk.meesters@gmail.com (Tjerk Meesters) --089e013a0d4282e04204f1bd7d54 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Thu, Feb 6, 2014 at 9:16 PM, Ferenc Kovacs wrote: > > > > On Thu, Feb 6, 2014 at 2:02 PM, Tjerk Meesters = wrote: > >> Hi Ferenc, >> >> > On 6 Feb, 2014, at 7:13 pm, Ferenc Kovacs wrote: >> > >> >> On Thu, Feb 6, 2014 at 11:31 AM, Ferenc Kovacs >> wrote: >> >> >> >> >> >> >> >> >> >>> On Thu, Feb 6, 2014 at 10:02 AM, Ferenc Kovacs >> wrote: >> >>> >> >>> >> >>> >> >>> >> >>>> On Thu, Feb 6, 2014 at 9:53 AM, Bob Weinand >> 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... >> >>>> >> >>>> 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 reve= rt >> >>> it, if nobody beats me to it. >> >>> >> >>> -- >> >>> Ferenc Kov=E1cs >> >>> @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 befo= re >> >> 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=E1cs >> >> @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=E1cs >> > @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 rebas= e > himself, or ask you to send another PR, but next time make sure that you > base the PR on the correct branch. > Roger that. In case it helps, I've created a branch off PHP-5.6 and cherry picked my commit into it; it can be found here: https://github.com/datibbaw/php-src/compare/php:PHP-5.6...pow-5.6 > > > -- > Ferenc Kov=E1cs > @Tyr43l - http://tyrael.hu > --=20 -- Tjerk --089e013a0d4282e04204f1bd7d54--