Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:70658
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmx.net designates 212.227.17.20 as permitted sender)
User-Agent: Microsoft-MacOutlook/14.3.7.130812
Date: Mon, 16 Dec 2013 02:15:37 -0800
To: Stas Malyshev <smalyshev@sugarcrm.com>,
	Joe Watkins <krakjoe@php.net>,
	PHP Internals <internals@lists.php.net>,
	David Soria Parra <dsp@php.net>
Message-ID: <CED412BC.170EE%dsoria@gmx.net>
Thread-Topic: PHP 5.4 branch?
In-Reply-To: <52AED1CE.6050104@sugarcrm.com>
Mime-version: 1.0
Content-type: text/plain;
	charset="US-ASCII"
Content-transfer-encoding: 7bit
Subject: Re: PHP 5.4 branch?
From: dsoria@gmx.net (David Soria Parra)
References: <52AED1CE.6050104@sugarcrm.com>

I am also wondering why dmitry is merging from upstream instead of
rebasing.

On 12/16/13, 2:11 AM, "Stas Malyshev" <smalyshev@sugarcrm.com> wrote:

>Hi!
>
>I see that with this commit:
>http://git.php.net/?p=php-src.git;a=commit;h=9db649f1a71a3603a6ff9dc6d597a
>7e28774f16f
>
>You've merged master into PHP 5.4. Why did you do that? This needs to be
>fixed ASAP (and may require force push rights to do cleanly, so CCing
>David too).
>-- 
>Stanislav Malyshev, Software Architect
>SugarCRM: http://www.sugarcrm.com/
>(408)454-6900 ext. 227