Oleg Pykhalov <[email protected]> writes: > Hello Mark, > > Thank you for explanation of procedure and macro specifications. > I've pushed ffd526e61ab1b45c6c913ab4e139193e4d5bee9b with a fix. > > Also, here is a patch to mention core-updates-next in the documentation. > > diff --git a/doc/contributing.texi b/doc/contributing.texi > index 2792fe2b2..1c33430aa 100644 > --- a/doc/contributing.texi > +++ b/doc/contributing.texi > @@ -410,7 +410,8 @@ to be merged in @code{master} every 3 weeks or so. > Topical changes > @item more than 1,200 dependent packages > @code{core-updates} branch (may include major and potentially disruptive > changes). This branch is intended to be merged in @code{master} every > -2.5 months or so. > +2.5 months or so. Also during official frozen period commits should go > +to @code{core-updates-next}. > @end table
Good idea. It would be good to clarify that this also applies for 'staging'. What do you think about this instead?
1 file changed, 9 insertions(+), 2 deletions(-)
doc/contributing.texi | 11 +++++++++--
modified doc/contributing.texi
@@ -413,12 +413,19 @@ changes). This branch is intended to be merged in @code{master} every
2.5 months or so.
@end table
-All these branches are tracked by our build farm
-and merged into @code{master} once
+All these branches are @uref{https://hydra.gnu.org/project/gnu,
+tracked by our build farm} and merged into @code{master} once
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.
+@c TODO: It would be good with badges on the website that tracks these
+@c branches. Or maybe even a status page.
+
@item
@cindex determinism, of build processes
@cindex reproducible builds, checking
[back]
signature.asc
Description: PGP signature
