From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: What's the convention for committing bug fixes? Date: Thu, 17 Apr 2014 22:17:06 +0000 Message-ID: <20140417221705.GB3423@acm.acm> References: <20140417185015.GA3423@acm.acm> <831twviv38.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1397773288 32306 80.91.229.3 (17 Apr 2014 22:21:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Apr 2014 22:21:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 18 00:21:21 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 1WaugK-0004Pj-Qk for ged-emacs-devel@m.gmane.org; Fri, 18 Apr 2014 00:21:20 +0200 Original-Received: from localhost ([::1]:35381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaugK-0006y8-E1 for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2014 18:21:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaugC-0006wf-7O for emacs-devel@gnu.org; Thu, 17 Apr 2014 18:21:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Waug6-0004Ek-ED for emacs-devel@gnu.org; Thu, 17 Apr 2014 18:21:12 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:33457 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waug6-0004De-4j for emacs-devel@gnu.org; Thu, 17 Apr 2014 18:21:06 -0400 Original-Received: (qmail 30912 invoked by uid 3782); 17 Apr 2014 22:21:03 -0000 Original-Received: from acm.muc.de (pD951804F.dip0.t-ipconnect.de [217.81.128.79]) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 18 Apr 2014 00:21:02 +0200 Original-Received: (qmail 4784 invoked by uid 1000); 17 Apr 2014 22:17:06 -0000 Content-Disposition: inline In-Reply-To: <831twviv38.fsf@gnu.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:171480 Archived-At: Hi, Eli. On Thu, Apr 17, 2014 at 11:01:31PM +0300, Eli Zaretskii wrote: > > Date: Thu, 17 Apr 2014 18:50:15 +0000 > > From: Alan Mackenzie > > For bug fixes which should go into both Emacs 24.4 and the trunk, where > > should they be committed? Into the 24.4 branch, into the trunk, or into > > both? > On the branch. They are then merged to the trunk. > > For recent previous releases, the convention was to commit to the > > release branch and somebody dedicated and energetic copied the commit to > > the trunk. > It's still that way. Of course, you can become one of those dedicated > and energetic persons yourself, the procedure is in admin/notes/bzr > (except that it calls the release branch "emacs-23"). Thanks! -- Alan Mackenzie (Nuremberg, Germany).