me/guix
Archived
1
0
Fork 0
Code Activity

doc: Try to improve the branching workflow.

Browse source 
* doc/contributing.texi (Submitting Patches): Introduce the use of "-frozen"
branch names.
This commit is contained in:
Leo Famulari 2021-02-11 16:11:16 -05:00
parent 0e3e26ca60
commit 175bea0ca4
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/contributing.texi
View file

@ -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 before they hit users, and to reduce the window during which pre-built
binaries are not available. binaries are not available.
Generally, branches other than @code{master} are considered When we decide to start building the @code{staging} or
@emph{frozen} if there has been a recent evaluation, or there is a @code{core-updates} branches, they will be renamed with the suffix
corresponding @code{-next} branch. Please ask on the mailing list or @code{-frozen}, at which time only bug fixes may be pushed to them. At
IRC if unsure where to place a patch. 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 TODO: It would be good with badges on the website that tracks these
@c branches. Or maybe even a status page. @c branches. Or maybe even a status page.

2
doc/guix.texi
View file

@ -28,7 +28,7 @@ Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@*
Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2014 Pierre-Antoine Rault@*
Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* 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{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@*
Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016 Ben Woodcroft@*
Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*