From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: State of the repository conversion Date: Thu, 20 Mar 2014 21:30:47 +0100 Organization: Probably a good idea Message-ID: <87ha6s4npk.fsf@dod.no> References: <20140319175124.BCCB3380835@snark.thyrsus.com> <83wqfq82ge.fsf@gnu.org> <20140319185416.GA25588@thyrsus.com> <83siqe80bj.fsf@gnu.org> <87siqdiven.fsf@uwakimon.sk.tsukuba.ac.jp> <83ior98qi4.fsf@gnu.org> <87lhw5qyx9.fsf@wanadoo.es> <83a9ck970z.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1395347468 17878 80.91.229.3 (20 Mar 2014 20:31:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Mar 2014 20:31:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 20 21:31:17 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 1WQjcS-0002XO-U3 for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 21:31:17 +0100 Original-Received: from localhost ([::1]:49160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQjcS-0002eY-Gz for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 16:31:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQjcK-0002da-5l for emacs-devel@gnu.org; Thu, 20 Mar 2014 16:31:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQjcE-0001FH-Be for emacs-devel@gnu.org; Thu, 20 Mar 2014 16:31:08 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:50083) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQjcE-0001FD-5P for emacs-devel@gnu.org; Thu, 20 Mar 2014 16:31:02 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WQjcB-0002AZ-Tv for emacs-devel@gnu.org; Thu, 20 Mar 2014 21:30:59 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Mar 2014 21:30:59 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Mar 2014 21:30:59 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 15 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (gnu/linux) Cancel-Lock: sha1:6BOT31gU/Yl2ZXLwWaKapbD8jOc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:170667 Archived-At: >>>>> Eli Zaretskii : > See my other mail: why not install changes on the trunk, and then > cherry-pick some of them to the release branch? Here's why I does it the other way around (ie. fix on branch and then merge to master): when a bug is reported on a released version, it feels more natural to do the fix against what was released, and then get some kind of patch or hotfix on that out the door, and then looking in to moving that fix to master. Taking an unreported fix from master and applying it to a relase branch with a cherry pick also happens, but for that to happen, it has to be a fix to an OMG!! condition (potential catastrophic data loss, or a high enough crash rate to be annoying), and those bugs are thankfully few...