branch master updated: doc: Try to improve the branching workflow.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 175bea0  doc: Try to improve the branching workflow.
175bea0 is described below

commit 175bea0ca42dba3e02109820efae0cac2804e73b
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Thu Feb 11 16:11:16 2021 -0500

    doc: Try to improve the branching workflow.
    
    * doc/contributing.texi (Submitting Patches): Introduce the use of "-frozen"
    branch names.
---
 doc/contributing.texi | 10 ++++++----
 doc/guix.texi         |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index f167df0..24f5caf 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.
 
diff --git a/doc/guix.texi b/doc/guix.texi
index 7d18703..8944f51 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -28,7 +28,7 @@ Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
 Copyright @copyright{} 2015, 2016 Mathieu Lirzin@*
 Copyright @copyright{} 2014 Pierre-Antoine Rault@*
 Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@*
-Copyright @copyright{} 2015, 2016, 2017, 2019, 2020 Leo Famulari@*
+Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@*
 Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@*
 Copyright @copyright{} 2016 Ben Woodcroft@*
 Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*