From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: What's the convention for committing bug fixes? Date: Thu, 17 Apr 2014 23:01:31 +0300 Message-ID: <831twviv38.fsf@gnu.org> References: <20140417185015.GA3423@acm.acm> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1397764903 4671 80.91.229.3 (17 Apr 2014 20:01:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Apr 2014 20:01:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 17 22:01:36 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 1WasV3-0005HH-1S for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2014 22:01:33 +0200 Original-Received: from localhost ([::1]:34854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WasV2-0001iz-NZ for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2014 16:01:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WasUv-0001ii-GP for emacs-devel@gnu.org; Thu, 17 Apr 2014 16:01:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WasUp-0002sX-OQ for emacs-devel@gnu.org; Thu, 17 Apr 2014 16:01:25 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:50385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WasUp-0002nZ-H3 for emacs-devel@gnu.org; Thu, 17 Apr 2014 16:01:19 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N4600200XZ5D200@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Thu, 17 Apr 2014 23:01:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N46002CZYA5DZ00@a-mtaout20.012.net.il>; Thu, 17 Apr 2014 23:01:17 +0300 (IDT) In-reply-to: <20140417185015.GA3423@acm.acm> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:171477 Archived-At: > 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").