Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:73600 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 86492 invoked from network); 5 Apr 2014 06:00:53 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 5 Apr 2014 06:00:53 -0000 Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 108.166.43.67 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 108.166.43.67 smtp67.ord1c.emailsrvr.com Linux 2.6 Received: from [108.166.43.67] ([108.166.43.67:60927] helo=smtp67.ord1c.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 6E/70-16521-41C9F335 for ; Sat, 05 Apr 2014 01:00:53 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp1.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id 0BB88148C17; Sat, 5 Apr 2014 02:00:50 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp1.relay.ord1c.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 88D93148143; Sat, 5 Apr 2014 02:00:49 -0400 (EDT) Message-ID: <533F9C11.9000303@sugarcrm.com> Date: Fri, 04 Apr 2014 23:00:49 -0700 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Kris Craig , =?UTF-8?B?Sm9oYW5uZXMgU2NobMO8dGVy?= CC: Julien Pauli , PHP Internals References: <1396523991.2982.340.camel@guybrush> <1396527638.2982.350.camel@guybrush> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] Branching PHP6 From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > That's part of it, but I've also noticed a ton of criss-crossed merging > happening between version branches. That, more than anything I think, What criss-crossed merging? Newer branches should never be merged into older ones, so I don't see how any criss-crossing is possible. > makes it a nightmare to read. Furthermore, there's simply no need to have > an ever-increasing number of dead branches that lead nowhere and never > merge back. If somebody wants to find a specific version, that's what tags Branches are dirt-cheap in git, so dead branches is not a problem. Also, the only dead branches are supposed to be release branches and very rarely feature branches, all the rest should be done in private branches and submitted as pull request. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227