On Thu, Nov 25, 2010 at 6:11 PM, Andi Gutmans <a...@zend.com> wrote: >> -----Original Message----- >> From: Jani Taskinen [mailto:jani.taski...@iki.fi] >> Sent: Thursday, November 25, 2010 12:25 AM >> To: da...@php.net >> Cc: PHP Internals >> Subject: Re: [PHP-DEV] Re: Hold off 5.4 >> >> Who says it has to be 5.4? People seem to be a bit fixated on the version >> there. >> Major BC breaks just means the version released from trunk is 6.0. And it's >> just >> a number. Big number, but still just a number. >> >> Merging (by and or by magic :) features into branch created from 5.3 just >> sounds like plane crash waiting to happen.. > > I agree and I don't think we're in as bad shape although there's some > cleaning up that needs to be done.
It is not bad, it is only painful. I did the merges for 5.3.0-3 and I can tell you that SVN is simply broken for such things. I do it with git for many other projects and I never had real issues. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php