about summary refs log tree commit diff
path: root/doc/contributing/submitting-changes.chapter.md
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2022-05-18 17:37:48 +0200
committerJanne Heß <janne@hess.ooo>2022-05-18 17:37:48 +0200
commitdabac4bf0c5eefbb07402189d9ba6efce3ff7b34 (patch)
tree3e4d1e15889560ad94843cbcc8192d397d6a92f9 /doc/contributing/submitting-changes.chapter.md
parentcc244236412c215135388136c0955531cf33d79b (diff)
downloadnixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar.gz
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar.bz2
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar.lz
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar.xz
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.tar.zst
nixlib-dabac4bf0c5eefbb07402189d9ba6efce3ff7b34.zip
doc: Document that the staging branches may be restricted
Diffstat (limited to 'doc/contributing/submitting-changes.chapter.md')
-rw-r--r--doc/contributing/submitting-changes.chapter.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 6f87e015b9cf..cded53cdd981 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -238,12 +238,16 @@ The `master` branch is the main development branch. It should only see non-break
 
 The `staging` branch is a development branch where mass-rebuilds go. Mass rebuilds are commits that cause rebuilds for many packages, like more than 500 (or perhaps, if it's 'light' packages, 1000). It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages.
 
+During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes.
+
 ### Staging-next branch {#submitting-changes-staging-next-branch}
 
 The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master ` branch.
 
 If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.
 
+During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes.
+
 ### Stable release branches {#submitting-changes-stable-release-branches}
 
 The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`.