Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:70669 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 1789 invoked from network); 16 Dec 2013 18:48:12 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Dec 2013 18:48:12 -0000 Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 173.203.6.155 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 173.203.6.155 smtp155.ord.emailsrvr.com Linux 2.6 Received: from [173.203.6.155] ([173.203.6.155:54222] helo=smtp155.ord.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 32/1C-32483-BEA4FA25 for ; Mon, 16 Dec 2013 13:48:11 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp16.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 1D1F53D031E; Mon, 16 Dec 2013 13:48:08 -0500 (EST) X-Virus-Scanned: OK Received: by smtp16.relay.ord1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 8C47B3D02FC; Mon, 16 Dec 2013 13:48:07 -0500 (EST) Message-ID: <52AF4AEA.7090709@sugarcrm.com> Date: Mon, 16 Dec 2013 10:48:10 -0800 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: David Soria Parra , Joe Watkins , PHP Internals , David Soria Parra References: <52AED1CE.6050104@sugarcrm.com> <52AED409.4060104@gmx.net> <52AF45E0.5020000@gmx.net> In-Reply-To: <52AF45E0.5020000@gmx.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: PHP 5.4 branch? From: smalyshev@sugarcrm.com (Stas Malyshev) 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. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227