Re: PHP 5.4 branch?

From:	Stas Malyshev	Date:	Mon, 16 Dec 2013 18:48:10 +0000
Subject:	Re: PHP 5.4 branch?
References:	1 2 3	Groups:	php.internals
Request:	Send a blank email to internals+get-70669@lists.php.net to get a copy of this message

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


   

Thread (10 messages)

• Stas MalyshevMon, 16 Dec 2013 10:11:26 +0000
  • David Soria ParraMon, 16 Dec 2013 10:15:37 +0000Re: PHP 5.4 branch?
  • David Soria ParraMon, 16 Dec 2013 10:20:57 +0000Re: PHP 5.4 branch?
    • Joe WatkinsMon, 16 Dec 2013 10:41:42 +0000
    • Ferenc KovacsMon, 16 Dec 2013 13:49:58 +0000Re: Re: PHP 5.4 branch?
      • Ferenc KovacsMon, 16 Dec 2013 14:04:47 +0000
    • David Soria ParraMon, 16 Dec 2013 18:26:40 +0000
      • Stas MalyshevMon, 16 Dec 2013 18:48:10 +0000
        • Hannes MagnussonWed, 25 Dec 2013 20:00:04 +0000Re: Re: PHP 5.4 branch?
          • Stas MalyshevWed, 25 Dec 2013 21:05:37 +0000