From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: correct way to install a bug fix? Date: Fri, 13 Jan 2017 10:46:49 +0200 Message-ID: <83a8avcpom.fsf@gnu.org> References: <87eg074e9q.fsf@tromey.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1484297222 21803 195.159.176.226 (13 Jan 2017 08:47:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 13 Jan 2017 08:47:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: Tom Tromey Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 13 09:46:58 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cRxVY-0004Mv-7U for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 09:46:48 +0100 Original-Received: from localhost ([::1]:39853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRxVc-0000DX-Rx for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 03:46:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRxVW-0000DQ-Lw for emacs-devel@gnu.org; Fri, 13 Jan 2017 03:46:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRxVT-0005zl-Iv for emacs-devel@gnu.org; Fri, 13 Jan 2017 03:46:46 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRxVT-0005zh-Fn; Fri, 13 Jan 2017 03:46:43 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3035 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cRxVS-0005Jx-PF; Fri, 13 Jan 2017 03:46:43 -0500 In-reply-to: <87eg074e9q.fsf@tromey.com> (message from Tom Tromey on Fri, 13 Jan 2017 00:20:33 -0700) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:211240 Archived-At: > From: Tom Tromey > Date: Fri, 13 Jan 2017 00:20:33 -0700 > > On the one hand, admin/notes/git-workflow seems to advise pushing to > master and then cherry-picking to the release branch, adding "Backport:" > to the commit message. > > On the other hand, admin/notes/repo says that fixes should be installed > on the release branch and then someone will sync them to master; and it > says that installing manually on more than one branch is bad. > > Which should I do? In general, the latter. (git-workflow only says what you cite under "Backporting", which describes a situation where a commit pushed to master is later regarded as appropriate for the release branch, which is not your use case.) However, we are very close to releasing Emacs 25.2 from the release branch, so currently the release branch is is only open for changes that fit one of the following criteria: . documentation changes . fixes for bugs that were introduced by Emacs 25.1 . very safe fixes for bugs introduced in v24.5 If your bugfixes don't fit any of these, please push to master. Thanks.