From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Branch freezing for release Date: Wed, 10 Apr 2019 18:03:46 +0300 Message-ID: <83zhox6gx9.fsf@gnu.org> References: <871s3jeh8m.fsf@ericabrahamsen.net> <87zhq4zzcz.fsf@ericabrahamsen.net> <871s3a90qo.fsf@ericabrahamsen.net> <87imvmbube.fsf@gmail.com> <87mukyiczg.fsf@ericabrahamsen.net> <877ec2iau1.fsf@ericabrahamsen.net> <4CAA6D9F-0402-489C-8DD1-CE2ADBAA42C9@gnu.org> <87tvf69r16.fsf_-_@gmail.com> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="16696"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 10 17:15:36 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hEEwq-0004Bw-3K for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2019 17:15:36 +0200 Original-Received: from localhost ([127.0.0.1]:33017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEEwo-0002m7-VE for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2019 11:15:35 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:55902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEEwR-0002LW-2h for emacs-devel@gnu.org; Wed, 10 Apr 2019 11:15:12 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEElQ-0005O0-PF; Wed, 10 Apr 2019 11:03:48 -0400 Original-Received: from [176.228.60.248] (port=4048 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hEElN-0004sg-O3; Wed, 10 Apr 2019 11:03:47 -0400 In-reply-to: (message from Stefan Monnier on Wed, 10 Apr 2019 09:14:06 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:235213 Archived-At: > From: Stefan Monnier > Date: Wed, 10 Apr 2019 09:14:06 -0400 > > FWIW, that's part of the reason why I suggested that we make > a emacs-26.2 branch once we start entering the phase where we should not > push any change unless explicitly allowed by the maintainer. This way > people can keep pushing random bug fixes to emacs-26, unaware that > an emacs-26.2 was created. Unless the hypothetical emacs-26.2 branch is local, why would people be unaware of its creation? Git happily announces its creation and each of its updates on every fetch/pull. > It's also useful for bug fixes which we'd want to have in a hypothetical > 26.3, so they don't get lost in master. It makes the rules simple: > > - master: always open for business. > - emacs-NN: bug-fixes only (merged back to master every once in a while) > - emacs-NN.MM: never touch unless specifically authorized to do so. I don't see this as a simplification, I see this as a complication: one more branch to track, to describe in CONTRIBUTE, to educate people about, to avoid mixing with others, etc. > Look ma! No need to follow emacs-devel to know in which phase we are! There's no need to follow emacs-devel now, either. The rules are laid out in CONTRIBUTE, and once each RC will have its modifications pushed and tagged, the problem which led to this particular bikeshedding should not happen again. IOW, this is a normal process of learning how to release Emacs cleanly.