From 7d9556681dc9aa23f6aba95e542e1c6e6aa01506 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 7 Nov 2018 16:02:59 +0000 Subject: [PATCH] docs: document the staging branch and add reference to it A while back we agreed that having a live/staging branch is beneficial. Sadly we forgot to document that, so here is my first attempt. Document the caveat that the branch history is not stable. CC: Andres Gomez CC: Dylan Baker Signed-off-by: Emil Velikov Reviewed-by: Juan A. Suarez --- docs/releasing.html | 20 ++++++++++++++++++++ docs/submittingpatches.html | 3 +++ 2 files changed, 23 insertions(+) diff --git a/docs/releasing.html b/docs/releasing.html index 87590b19301..e4c770f9186 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -21,6 +21,7 @@
  • Overview
  • Release schedule
  • Cherry-pick and test +
  • Staging branch
  • Making a branchpoint
  • Pre-release announcement
  • Making a new release @@ -212,6 +213,25 @@ system and making some every day's use until the release may be a good idea too.

    +

    Staging branch

    + +

    +A live branch, which contains the currently merge/rejected patches is available +in the main repository under staging/X.Y. For example: +

    +
    +	staging/18.1 - WIP branch for the 18.1 series
+	staging/18.2 - WIP branch for the 18.2 series
+
    + +

    +Notes: +

    +
      +
    • People are encouraged to test the staging branch and report regressions.
      • +
    • The branch history is not stable and it will be rebased,
      • +
    +

    Making a branchpoint

    diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html index b84f01c3b37..3f97c941aa5 100644 --- a/docs/submittingpatches.html +++ b/docs/submittingpatches.html @@ -253,6 +253,9 @@ If you are not the author of the original patch, please Cc: them in your nomination request.

    +

    +The current patch status can be observed in the staging branch. +

    The stable tag

    -- 2.30.2