aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-04-26 13:50:19 -0400
committerLeo Famulari <leo@famulari.name>2021-04-26 16:10:53 -0400
commit4de688738ce802056dadd6f785c7bdb3407dc768 (patch)
treef89cfc9b39431b2c0fabecd2c9b81da562e83d20
parentbd3f3f81506db2e93a9ec2e60546d36ea9edab85 (diff)
downloadguix-4de688738ce802056dadd6f785c7bdb3407dc768.tar
guix-4de688738ce802056dadd6f785c7bdb3407dc768.tar.gz
doc: Clarify the utility of the development branches.
* doc/contributing.texi (Submitting Patches): Clarify the utility of the 'staging' and 'core-updates' branches.
-rw-r--r--doc/contributing.texi6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index d5025dd189..0a39aa89d6 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1080,12 +1080,14 @@ rebuilding induced, commits go to different branches, along these lines:
@code{staging} branch (non-disruptive changes). This branch is intended
to be merged in @code{master} every 6 weeks or so. Topical changes
(e.g., an update of the GNOME stack) can instead go to a specific branch
-(say, @code{gnome-updates}).
+(say, @code{gnome-updates}). This branch is not expected to be
+buildable or usable until late in its development process.
@item more than 1,800 dependent packages
@code{core-updates} branch (may include major and potentially disruptive
changes). This branch is intended to be merged in @code{master} every
-6 months or so.
+6 months or so. This branch is not expected to be buildable or usable
+until late in its development process.
@end table
All these branches are @uref{@value{SUBSTITUTE-URL},