Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59567 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 11977 invoked from network); 9 Apr 2012 21:57:13 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 9 Apr 2012 21:57:13 -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 67.192.241.153 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 67.192.241.153 smtp153.dfw.emailsrvr.com Linux 2.6 Received: from [67.192.241.153] ([67.192.241.153:46092] helo=smtp153.dfw.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id C6/01-34074-83B538F4 for ; Mon, 09 Apr 2012 17:57:13 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp15.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id D0C0F30037D; Mon, 9 Apr 2012 17:57:09 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp15.relay.dfw1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 82914300268; Mon, 9 Apr 2012 17:57:09 -0400 (EDT) Message-ID: <4F835B34.5020909@sugarcrm.com> Date: Mon, 09 Apr 2012 14:57:08 -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> <4F834F94.1000002@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! > release candidates. I mean, we're still planning on having multiple > release candidates before an actual release, right? If so, then Not if we can avoid it. If we don't have critical bugs in RC1, we release it. > obviously we'll need a way to commit those changes. If they're not made > on the RC branch, then where were you thinking they should go, and how > would we then apply those bugfixes to the 5.4 trunk if not through a merge? If you have bugfix for 5.4, commit it into 5.4. If it's critical for current release, it will be pulled by RM into the release, otherwise he automatically becomes part of the next release. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227