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: What's the convention for committing bug fixes? Date: Thu, 17 Apr 2014 18:50:15 +0000 Message-ID: <20140417185015.GA3423@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1397760888 1115 80.91.229.3 (17 Apr 2014 18:54:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Apr 2014 18:54:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 17 20:54:41 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 1WarSH-0000S0-OY for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2014 20:54:37 +0200 Original-Received: from localhost ([::1]:34493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WarSH-0002iU-AY for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2014 14:54:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WarS6-0002Zo-Kk for emacs-devel@gnu.org; Thu, 17 Apr 2014 14:54:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WarRy-0006d8-Mz for emacs-devel@gnu.org; Thu, 17 Apr 2014 14:54:26 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:65048 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WarRy-0006cp-GY for emacs-devel@gnu.org; Thu, 17 Apr 2014 14:54:18 -0400 Original-Received: (qmail 13796 invoked by uid 3782); 17 Apr 2014 18:54:13 -0000 Original-Received: from acm.muc.de (pD951804F.dip0.t-ipconnect.de [217.81.128.79]) by colin.muc.de (tmda-ofmipd) with ESMTP; Thu, 17 Apr 2014 20:54:12 +0200 Original-Received: (qmail 3443 invoked by uid 1000); 17 Apr 2014 18:50:15 -0000 Content-Disposition: inline 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:171476 Archived-At: Hello, Emacs. 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? For recent previous releases, the convention was to commit to the release branch and somebody dedicated and energetic copied the commit to the trunk. Sorry if this has already been discussed and I somehow missed it. -- Alan Mackenzie (Nuremberg, Germany).