[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Branch freezing for release
From: |
Noam Postavsky |
Subject: |
Re: Branch freezing for release |
Date: |
Thu, 11 Apr 2019 21:03:28 -0400 |
On Thu, 11 Apr 2019 at 09:53, Eli Zaretskii <address@hidden> 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
- Re: Branch freezing for release, (continued)
- Re: Branch freezing for release, Stefan Monnier, 2019/04/10
- Re: Branch freezing for release, Eli Zaretskii, 2019/04/10
- Re: Branch freezing for release, Stefan Monnier, 2019/04/10
- Re: Branch freezing for release, Eli Zaretskii, 2019/04/10
- Re: Branch freezing for release, Dmitry Gutov, 2019/04/10
- Re: Branch freezing for release, Noam Postavsky, 2019/04/10
- Re: Branch freezing for release, Eli Zaretskii, 2019/04/11
- Re: Branch freezing for release,
Noam Postavsky <=
- Re: Branch freezing for release, Eli Zaretskii, 2019/04/12
- Re: Branch freezing for release, Noam Postavsky, 2019/04/12
- Re: Branch freezing for release, Stefan Monnier, 2019/04/12
- Re: Branch freezing for release, Eli Zaretskii, 2019/04/12
- Re: Branch freezing for release, Dmitry Gutov, 2019/04/12
Re: Branch freezing for release, Stefan Monnier, 2019/04/10