From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Branch freezing for release Date: Thu, 11 Apr 2019 21:03:28 -0400 Message-ID: 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> <4C62647A-5A71-4C82-9D37-ED933023AFC0@gnu.org> <83pnpt6cf9.fsf@gnu.org> <87pnpt4x0d.fsf@tcd.ie> <83mukx6ayb.fsf@gnu.org> <83lg0h67jb.fsf@gnu.org> <83imvl653m.fsf@gnu.org> <223fd85b-855c-dbbb-315f-9508e348926b@yandex.ru> <835zrk643r.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="229329"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Emacs developers , Stefan Monnier , Dmitry Gutov To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 12 03:04:31 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 1hEkcJ-000xYl-9n for ged-emacs-devel@m.gmane.org; Fri, 12 Apr 2019 03:04:31 +0200 Original-Received: from localhost ([127.0.0.1]:56983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEkcF-0007xI-Bh for ged-emacs-devel@m.gmane.org; Thu, 11 Apr 2019 21:04:27 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:33394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEkbX-0007xA-VV for emacs-devel@gnu.org; Thu, 11 Apr 2019 21:03:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEkbW-0002Db-1d for emacs-devel@gnu.org; Thu, 11 Apr 2019 21:03:43 -0400 Original-Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]:45394) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEkbU-0002CW-MC; Thu, 11 Apr 2019 21:03:40 -0400 Original-Received: by mail-oi1-x234.google.com with SMTP id y84so6561462oia.12; Thu, 11 Apr 2019 18:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rAn2YapDIr7p6BLFq31pxCD/zkVjWpaer9wIDHyUgps=; b=JxblKGyDUdPpyIHwfW5Skibh4htLQkTYJNiaR/5ZGGb2Jtae1Iw0wNOjNBbYaivUwA PRAaDn1YTjrYCt/azPwqvDzyNBc4hMxJLfk6qi6AlWJqbp3HxNGLar6VV2UFpwYBHHiV U/jBRnXCf/txN5nsXBHTnVhjuuACxUKx+YvIrLixOJlMO2lUQC0qy0VwhPiTZdiHHI9i LwGvnderCxXsDoPpzOCJ/VOd4zgUb7ZKv/QftbzbreOinAaBogInYSZWv+dnyBgMO+Ss yGMSQ0awJ2ELY0ZczNKpeBe6klc4BxCNW0lySTdprGVnv3Q/4WHCRqtvKtvrMOFAHHKL NsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rAn2YapDIr7p6BLFq31pxCD/zkVjWpaer9wIDHyUgps=; b=BY782oO3U6LoSAoas6zymGOhw+tS0Hw83wBdY3gmtnO2yMcTQfqFBAqUDssBFs8ZT1 xLyP2I/ZrwkA7PzzhyTCEHKsJN1ea9amFJz0OlWaU9wHxbfIoqBWXiDxtByEZsJR31VE vECd+qgMGrg0KXaK6CTGZahBw1mHHbYEhjI47unjOfIekptid9SOatX0v1mtchtIV1ct W65zXR3N1njDQvhno3kuMKctJI1BHgHdGOcgMKS/G003VNjW6Y2KDHK0WocKAjDIc2YX lRfmgJReTDs1Ezw7X4W9VRPDDcpBcu2+YdDm+DRMehGjAAxf13nId+JlG3apP3MTSpqi t8+g== X-Gm-Message-State: APjAAAXoLIvqKKMIX9767Kk/bHKvAlXcdby7kXb4g3xt5MWwnFKv8E3G n+/o20XApyThEbyogaAfURpHr3TF6det2rTs1DFINdx/ X-Google-Smtp-Source: APXvYqwTYwFMn6FEFqEJezMfoTTMcYjmUF626o7EGSGFlRLukhnYXdrUMXGNZJSszwvGkydhVwPpYmNAhSidPQ01jQo= X-Received: by 2002:aca:ac84:: with SMTP id v126mr7964187oie.87.1555031019526; Thu, 11 Apr 2019 18:03:39 -0700 (PDT) In-Reply-To: <835zrk643r.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::234 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:235322 Archived-At: On Thu, 11 Apr 2019 at 09:53, Eli Zaretskii wrote: > > > But there are period where you can commit to an emacs-xx branch without > > > asking in advance. > > > > Which, if I understand CONTRIBUTE correctly, is only when the emacs-xx > > branch has the version set to xx.0.mm. > > Yes, exactly. > > > Though perhaps there is some fuzziness in CONTRIBUTE over the exact > > meaning of "is in the very last stages of its pretest". > > If someone can suggest a better way of saying that, please do. The > text does say soon afterwards "if you are unsure, ask". Maybe it helps to spell out a number? --- i/CONTRIBUTE +++ w/CONTRIBUTE @@ -289,9 +289,8 @@ admin/notes/git-workflow. If you are fixing a bug that exists in the current release, you should generally commit it to the release branch; it will be merged to the -master branch later by the gitmerge function. However, when the -release branch is for Emacs version NN.2 and later, or when it is for -Emacs version NN.1 that is in the very last stages of its pretest, +master branch later by the gitmerge function. However, unless the +release branch is on Emacs version NN.0.90 or lower, that branch is considered to be in a feature freeze: only bug fixes that are "safe" or are fixing major problems should go to the release branch, the rest should be committed to the master branch. This is so