Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59557 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 96480 invoked from network); 9 Apr 2012 21:07:38 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 9 Apr 2012 21:07:38 -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 67.192.241.193 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 67.192.241.193 smtp193.dfw.emailsrvr.com Linux 2.6 Received: from [67.192.241.193] ([67.192.241.193:36268] helo=smtp193.dfw.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 43/BD-34074-99F438F4 for ; Mon, 09 Apr 2012 17:07:38 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp19.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 8909B3C8200; Mon, 9 Apr 2012 17:07:34 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp19.relay.dfw1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 30FEC3C81D1; Mon, 9 Apr 2012 17:07:34 -0400 (EDT) Message-ID: <4F834F94.1000002@sugarcrm.com> Date: Mon, 09 Apr 2012 14:07:32 -0700 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:11.0) Gecko/20120313 Thunderbird/11.0 MIME-Version: 1.0 To: Kris Craig CC: Kiall Mac Innes , PHP Internals References: <4F82878A.6030609@sugarcrm.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] release process with git From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > version of a "Release-x.xx" branch. I would suggest allowing commits on > that branch, but *only* if they're bugfixes or minor housekeeping. Each I don't want to do this, because this would very quickly lead us back to old chaotic situation where people commit stuff at the last moment and it's not properly tested. I prefer to have defined merge points. > commit would basically be the equivalent of a release candidate (i.e. > initial branch commit would be RC1, next commit RC2, etc). > > Then when it's time to pull the trigger, the final commit on that branch > will be the actual release. Then merge that branch back into PHP-5.4. That's what I don't want to do. I don't want people to be live-committing into release branch and then merge it back to dev branch. I want release branch be clean and frozen as much as possible, and people committing to dev branch as needed. No last-minute bugfixes either unless it's a bug that absolutely breaks the release - otherwise it'll be released in a month, most bugs can wait for a month without any problem, given that they waited till now. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227