[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging release branch
From: |
Glenn Morris |
Subject: |
Merging release branch |
Date: |
Fri, 29 Oct 2021 12:35:22 -0400 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
I've had enough of merging the release branch to master,
so someone else will have to do it from now on.
I use admin/automerge from cron with a wrapper that:
1) first checks the release branch passed make check
2) passes "-n 1" if the last merge was more than 1 week ago
The final straw was a triple failure in the automatic merge today due to:
an easily avoidable build breakage in the release branch
a non-repeatable check failure due to network-stream-tests timing out
(such classes of test failure are common)
3 separate merge conflicts due to the same code being modified on both branches
- Merging release branch,
Glenn Morris <=
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/29
- Re: Merging release branch, Stefan Kangas, 2021/10/29
- Re: Merging release branch, Stefan Monnier, 2021/10/29
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/29
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/29
- Re: Merging release branch, Daniel Martín, 2021/10/29
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/30
- Re: Merging release branch, Daniel Martín, 2021/10/30
- Re: Merging release branch, Tassilo Horn, 2021/10/30
- Re: Merging release branch, Eli Zaretskii, 2021/10/29