diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-05-31 09:25:12 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-06-12 19:52:57 +0100 |
| commit | 0ea096ae23fa81f05ce97e5e61c15647c0a475ec (patch) | |
| tree | 1cb6836915009b50a954882a21d1c08fe0e027d5 /doc/guix.texi | |
| parent | 3bea4c0c191e04a37662d2be0ed47ad867b70345 (diff) | |
| download | guix-0ea096ae23fa81f05ce97e5e61c15647c0a475ec.tar guix-0ea096ae23fa81f05ce97e5e61c15647c0a475ec.tar.gz | |
doc: Move and rewrite the branching strategy.
Move away from using staging and core-updates, and make the strategy
independant of branch names.
Keep the 300 dependent threshold for changes to master, as I don't have any
specific reason to change this.
Most importantly, require using guix-patches issues to coordinate merging of
the branches, as I think that'll address the key issues that have shown up
recently where it's been unclear which branch should be merged next.
* doc/contributing.texi (Submitting Patches): Move the branching strategy to a
new Managing Patches and Branches section.
(Managing Patches and Branches): New section.
(Commit Policy): Simplify through referencing the new Managing Patches and
Branches section.
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'doc/guix.texi')
| -rw-r--r-- | doc/guix.texi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 395fc25818..43dffe08c1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -637,18 +637,18 @@ includes POWER9 systems such as the RYF Talos II mainboard}. This platform is available as a "technology preview": although it is supported, substitutes are not yet available from the build farm (@pxref{Substitutes}), and some packages may fail to -build (@pxref{Tracking Bugs and Patches}). That said, the Guix +build (@pxref{Tracking Bugs and Changes}). That said, the Guix community is actively working on improving this support, and now is a great time to try it and get involved! @item riscv64-linux little-endian 64-bit RISC-V processors, specifically RV64GC, and -Linux-Libre kernel. This platform is available as a "technology preview": -although it is supported, substitutes are not yet available from the -build farm (@pxref{Substitutes}), and some packages may fail to build -(@pxref{Tracking Bugs and Patches}). That said, the Guix community is -actively working on improving this support, and now is a great time to -try it and get involved! +Linux-Libre kernel. This platform is available as a "technology +preview": although it is supported, substitutes are not yet available +from the build farm (@pxref{Substitutes}), and some packages may fail to +build (@pxref{Tracking Bugs and Changes}). That said, the Guix +community is actively working on improving this support, and now is a +great time to try it and get involved! @end table |