Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:70874
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.192.179 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <52AF4AEA.7090709@sugarcrm.com>
References: <52AED1CE.6050104@sugarcrm.com>
	<52AED409.4060104@gmx.net>
	<52AF45E0.5020000@gmx.net>
	<52AF4AEA.7090709@sugarcrm.com>
Date: Wed, 25 Dec 2013 12:00:04 -0800
Message-ID: <CADNQb0V6-aWrPv62XLuhme-U8p=ffcoJbKSMsiEwPTwhYSr-SQ@mail.gmail.com>
To: Stas Malyshev <smalyshev@sugarcrm.com>
Cc: David Soria Parra <dsoria@gmx.net>, Joe Watkins <krakjoe@php.net>, 
	PHP Internals <internals@lists.php.net>, David Soria Parra <dsp@php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] Re: PHP 5.4 branch?
From: hannes.magnusson@gmail.com (Hannes Magnusson)

On Mon, Dec 16, 2013 at 10:48 AM, Stas Malyshev <smalyshev@sugarcrm.com> wrote:
> Hi!
>
>> it looks like there is even more mess. I think laruence has
>> accidentally merged before. I try to clean it up. Stas please verify
>> that the new version is correct. This will miss out commit
>> 330168a2477666212797095449029e78dcce0844 on PHP-5.4. People should be
>> more aware of what they are doing. The merges in the repository are a
>> mess and it's hard to wrap my head around who was merging was on his
>> local machine from upstream or anything else.
>
> Unfortunately, it still looks like 5.4 is not right. Look here:
> http://git.php.net/?p=php-src.git;a=log;h=refs/heads/PHP-5.4
>
> You can still see a bunch of 5.5 commits.



Its been over a week.. I suspect this has been resolved?

-Hannes