[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/10: doc: Clarify when branches are "frozen".

From: Marius Bakke
Subject: 01/10: doc: Clarify when branches are "frozen".
Date: Sat, 16 Jun 2018 15:37:23 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 38ab778fbd676fe7f7a84220d0cf7f474573dc2b
Author: Marius Bakke <address@hidden>
Date:   Sat May 26 15:39:13 2018 +0200

    doc: Clarify when branches are "frozen".
    * doc/contributing.texi (Submitting Patches): Provide a link to Hydra.  Add
    section about freezing branches.
 doc/contributing.texi | 11 +++++++++--
 doc/guix.texi         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 205c972..ca44b3b 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -407,12 +407,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{,
+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
address@hidden 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.
address@hidden TODO: It would be good with badges on the website that tracks 
address@hidden branches.  Or maybe even a status page.
 @cindex determinism, of build processes
 @cindex reproducible builds, checking
diff --git a/doc/guix.texi b/doc/guix.texi
index a90af34..1ecb110 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -37,7 +37,7 @@ Copyright @copyright{} 2017 Carlo address@hidden
 Copyright @copyright{} 2017 Thomas address@hidden
 Copyright @copyright{} 2017 address@hidden
 Copyright @copyright{} 2017 Christopher Allan address@hidden
-Copyright @copyright{} 2017 Marius address@hidden
+Copyright @copyright{} 2017, 2018 Marius address@hidden
 Copyright @copyright{} 2017 Hartmut address@hidden
 Copyright @copyright{} 2017 Maxim address@hidden
 Copyright @copyright{} 2017, 2018 Tobias address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]