From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.devel Subject: correct way to install a bug fix? Date: Fri, 13 Jan 2017 00:20:33 -0700 Message-ID: <87eg074e9q.fsf@tromey.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484292086 29679 195.159.176.226 (13 Jan 2017 07:21:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 13 Jan 2017 07:21:26 +0000 (UTC) To: Emacs discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 13 08:21:21 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 1cRwAl-0006sJ-27 for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 08:21:15 +0100 Original-Received: from localhost ([::1]:39552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRwAp-0005p5-KC for ged-emacs-devel@m.gmane.org; Fri, 13 Jan 2017 02:21:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRwAf-0005nn-0H for emacs-devel@gnu.org; Fri, 13 Jan 2017 02:21:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRwAZ-0007gV-UB for emacs-devel@gnu.org; Fri, 13 Jan 2017 02:21:08 -0500 Original-Received: from gproxy8-pub.mail.unifiedlayer.com ([67.222.33.93]:56840) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1cRwAZ-0007bH-Fm for emacs-devel@gnu.org; Fri, 13 Jan 2017 02:21:03 -0500 Original-Received: (qmail 27933 invoked by uid 0); 13 Jan 2017 07:20:42 -0000 Original-Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy8.mail.unifiedlayer.com with SMTP; 13 Jan 2017 07:20:42 -0000 Original-Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id XjLb1u00F2f2jeq01jLebi; Fri, 13 Jan 2017 00:20:41 -0700 X-Authority-Analysis: v=2.1 cv=V+Huj4Xi c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=_TmCtjw2wG6EYjFO-OsA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From; bh=032c8je1ZVpoUoldBGuac/PGDHZo0v4oGII5ln//EpY=; b=ntoPQW7cohNVw4lfTUK9X8oJFF Lk/+KExDU+krrrDNIGx3g1uRbGmOo3kOK1pnkMg3XgBv7PiXVjxl5I7f1yialt6WFaeRmzIjAfo2U rRQhDoH1EFCrZr/Twq4wpQYVK; Original-Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:48986 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1cRwA8-0007z4-AD; Fri, 13 Jan 2017 00:20:36 -0700 X-Attribution: Tom X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cRwA8-0007z4-AD X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (bapiya) [174.16.146.181]:48986 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 67.222.33.93 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:211236 Archived-At: Hi. I have a few Emacs bug fixes that I would like to push. However, I don't know the correct way to do this. 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? thanks, Tom