From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: CONTRIBUTE and where to commit bug fixes Date: Mon, 24 Sep 2018 09:14:03 -0400 Message-ID: References: <87pnxqyvk8.fsf@web.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1537794843 5825 195.159.176.226 (24 Sep 2018 13:14:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 24 Sep 2018 13:14:03 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 24 15:13:59 2018 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 1g4QgZ-0001NC-7Q for ged-emacs-devel@m.gmane.org; Mon, 24 Sep 2018 15:13:59 +0200 Original-Received: from localhost ([::1]:45185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4Qie-00073H-Ne for ged-emacs-devel@m.gmane.org; Mon, 24 Sep 2018 09:16:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4Qh0-0005uB-Aq for emacs-devel@gnu.org; Mon, 24 Sep 2018 09:14:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4Qgw-0006yF-WE for emacs-devel@gnu.org; Mon, 24 Sep 2018 09:14:26 -0400 Original-Received: from [195.159.176.226] (port=49069 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4Qgw-0006uD-K2 for emacs-devel@gnu.org; Mon, 24 Sep 2018 09:14:22 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1g4Qeb-0007M7-VA for emacs-devel@gnu.org; Mon, 24 Sep 2018 15:11:57 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:ZQ+bSCaRS1228looumBJfoPI+ek= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 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:230015 Archived-At: > but that's obviously not always true: depending on the release cycle, > only fixes for bugs that where introduced in the last release are > accepted, or even less. Right. Looks like you've followed this list long enough to know how it works ;-) > And if a fix is not ok for the release branch in a moment, should it > go to master, or should it just wait until later? Install it on master. If the patch should apply to the next bug-fix release, but can't be installed because we're in "deep freeze", we should (but don't AFAIK) have some other branch for that patch, indeed. > How can I find out which fixes are acceptable for the release branch at > any moment without asking every time? Follow the list with enough dedication to know when we're in deep freeze and when we're not. Maybe rather than document the way we work in more detail (which won't really help solve the problem, obviously), we could change the way we work to make it more clear: - when we start the "new major release" process, we create a new branch (e.g. emacs-27). Nothing new here. - when we enter the "deep freeze" process, rather than announce it and hope people will know about it, we create yet another branch (e.g. emacs-27.1). Then the rule can be documented more simply in the doc: - master is for new features. - emacs-NN is for any bug and doc fix. - emacs-NN.MM only takes bug fixes for regressions and requires explicit agreement from the maintainers. This also solves the problem of where to install non-regression bug fixes when we're in deep freeze. Stefan