all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Merging release branch
@ 2021-10-29 16:35 Glenn Morris
  2021-10-29 16:42 ` Lars Ingebrigtsen
                   ` (3 more replies)
  0 siblings, 4 replies; 47+ messages in thread
From: Glenn Morris @ 2021-10-29 16:35 UTC (permalink / raw)
  To: emacs-devel


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



^ permalink raw reply	[flat|nested] 47+ messages in thread

end of thread, other threads:[~2021-11-06 17:19 UTC | newest]

Thread overview: 47+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-29 16:35 Merging release branch Glenn Morris
2021-10-29 16:42 ` Lars Ingebrigtsen
2021-10-29 17:01 ` Stefan Kangas
2021-10-29 18:10   ` Stefan Monnier
2021-10-29 18:26     ` Lars Ingebrigtsen
2021-10-29 18:52       ` Lars Ingebrigtsen
2021-10-29 19:55         ` Daniel Martín
2021-10-30 11:42           ` Lars Ingebrigtsen
2021-10-30 13:42             ` Daniel Martín
2021-10-30 20:32               ` Tassilo Horn
2021-10-29 19:58         ` Eli Zaretskii
2021-10-30 11:51           ` Lars Ingebrigtsen
2021-10-30 12:11             ` Eli Zaretskii
2021-10-30 12:30               ` Dmitry Gutov
2021-10-30 12:32                 ` Eli Zaretskii
2021-10-30 13:34                   ` dick
2021-10-31 11:38                   ` Dmitry Gutov
2021-10-31 13:03                     ` Eli Zaretskii
2021-10-30 16:33                 ` Eli Zaretskii
2021-10-30 21:36                   ` Dmitry Gutov
2021-10-31  7:19                     ` Eli Zaretskii
2021-10-30 23:14                   ` Gregory Heytings
2021-10-30 23:17                     ` Dmitry Gutov
2021-10-31  7:20                     ` Eli Zaretskii
2021-10-31  8:13                       ` Gregory Heytings
2021-10-31 11:40                       ` Dmitry Gutov
2021-10-31 12:58                         ` Gregory Heytings
2021-10-31 21:59                           ` Dmitry Gutov
2021-10-31 14:46                         ` Lars Ingebrigtsen
2021-10-31 15:12                           ` Eli Zaretskii
2021-10-31 15:15                             ` Lars Ingebrigtsen
2021-10-31 16:02                               ` Dealing with merge noise (was: Merging release branch) Kévin Le Gouguec
2021-10-31 18:19                                 ` Stefan Kangas
2021-10-31 18:31                                   ` Eli Zaretskii
2021-10-31 22:00                           ` Merging release branch Dmitry Gutov
2021-10-30 12:31               ` Lars Ingebrigtsen
2021-10-30 12:48                 ` Eli Zaretskii
2021-10-29 19:00       ` Stefan Monnier
2021-10-29 19:05         ` Lars Ingebrigtsen
2021-10-29 19:17           ` Stefan Monnier
2021-10-29 20:29           ` David Engster
2021-10-29 17:08 ` dick
2021-11-06  9:28 ` Eli Zaretskii
2021-11-06 10:53   ` Stefan Kangas
2021-11-06 16:14     ` Glenn Morris
2021-11-06 16:11   ` Glenn Morris
2021-11-06 17:19     ` Eli Zaretskii

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.