From 175bea0ca42dba3e02109820efae0cac2804e73b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Feb 2021 16:11:16 -0500 Subject: doc: Try to improve the branching workflow. * doc/contributing.texi (Submitting Patches): Introduce the use of "-frozen" branch names. --- doc/contributing.texi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/contributing.texi') diff --git a/doc/contributing.texi b/doc/contributing.texi index f167df067c..24f5cafe06 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1086,10 +1086,12 @@ everything has been successfully built. This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available. -Generally, branches other than @code{master} are considered -@emph{frozen} if there has been a recent evaluation, or there is a -corresponding @code{-next} branch. Please ask on the mailing list or -IRC if unsure where to place a patch. +When we decide to start building the @code{staging} or +@code{core-updates} branches, they will be renamed with the suffix +@code{-frozen}, at which time only bug fixes may be pushed to them. At +the same time, a corresponding branch suffixed with @code{-next} will be +created to accept patches for the next cycle. Please ask on the mailing +list or IRC if unsure where to place a patch. @c TODO: It would be good with badges on the website that tracks these @c branches. Or maybe even a status page. -- cgit v1.2.3