From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Emacs branches in git Date: Sat, 15 Feb 2014 20:50:17 -0800 Organization: Newt Software Message-ID: <3188.1392526217@olgas.newt.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Trace: ger.gmane.org 1392526229 27030 80.91.229.3 (16 Feb 2014 04:50:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Feb 2014 04:50:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 16 05:50:38 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WEtgZ-0004Uu-Mk for ged-emacs-devel@m.gmane.org; Sun, 16 Feb 2014 05:50:35 +0100 Original-Received: from localhost ([::1]:59904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEtgZ-0007Zr-9e for ged-emacs-devel@m.gmane.org; Sat, 15 Feb 2014 23:50:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEtgQ-0007ZU-Jc for emacs-devel@gnu.org; Sat, 15 Feb 2014 23:50:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEtgJ-0005ft-MA for emacs-devel@gnu.org; Sat, 15 Feb 2014 23:50:26 -0500 Original-Received: from tassie.newt.com ([66.135.33.59]:60878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEtgJ-0005fp-I3 for emacs-devel@gnu.org; Sat, 15 Feb 2014 23:50:19 -0500 Original-Received: from olgas.newt.com (c-24-6-50-86.hsd1.ca.comcast.net [24.6.50.86]) by tassie.newt.com (Postfix) with ESMTPSA id 12CEC6802D3 for ; Sat, 15 Feb 2014 20:50:18 -0800 (PST) Original-Received: by olgas.newt.com (Postfix, from userid 1000) id 4CF7115611C; Sat, 15 Feb 2014 20:50:17 -0800 (PST) Original-Received: from olgas.newt.com (localhost [127.0.0.1]) by olgas.newt.com (Postfix) with ESMTP id 35E53156090 for ; Sat, 15 Feb 2014 20:50:17 -0800 (PST) X-Mailer: MH-E 8.5+bzr; nmh 1.5; GNU Emacs 23.4.1 X-Image-URL: http://www.newt.com/wohler/images/bill-diving.png Content-ID: <28894.1392524870.1@olgas.newt.com> Mail-Followup-To: emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 66.135.33.59 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:169644 Archived-At: I missed the transition discussion in January, but it doesn't look like I missed the transition :-). I didn't see any discussion about branching conventions in regards to release strategy and branch namespaces. I apologize if I missed it. For a release strategy, the one espoused in this page is popular: http://nvie.com/posts/a-successful-git-branching-model/ I'd also recommend against a flat branch namespace in the upstream repository. Here are some thoughts on dividing the branches, including dev and master for completeness: master: For tagged releases. dev: How trunk is used now. releases: Release branches, such as releases/emacs-24 features: Larger features, such as features/gnus or features/mh-e. topics: Ephemeral feature or bugfix branches, such as topics/vc-git or topics/16694. bugs: Perhaps folks might prefer bugs/16694 instead. The latter two namespaces would mostly only live in the developer's repository, but it would be good to have a convention in case they are pushed for sharing. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD