Module: Mesa Branch: staging/18.3 Commit: ede46c67ea35c076721aac0d1b751eb589e50629 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ede46c67ea35c076721aac0d1b751eb589e50629
Author: Emil Velikov <[email protected]> Date: Wed Nov 7 15:59:07 2018 +0000 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 <[email protected]> CC: Dylan Baker <[email protected]> CC: Juan A. Suarez Romero <[email protected]> Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit 0a60708870e256432bdef1a22c98b09f83d8a440) --- docs/releasing.html | 20 ++++++++++++++++++++ docs/submittingpatches.html | 3 +++ 2 files changed, 23 insertions(+) diff --git a/docs/releasing.html b/docs/releasing.html index 52e102207d..c79a020efa 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -21,6 +21,7 @@ <li><a href="#overview">Overview</a> <li><a href="#schedule">Release schedule</a> <li><a href="#pickntest">Cherry-pick and test</a> +<li><a href="#stagingbranch">Staging branch</a> <li><a href="#branch">Making a branchpoint</a> <li><a href="#prerelease">Pre-release announcement</a> <li><a href="#release">Making a new release</a> @@ -209,6 +210,25 @@ system and making some every day's use until the release may be a good idea too. </p> +<h1 id="stagingbranch">Staging branch</h1> + +<p> +A live branch, which contains the currently merge/rejected patches is available +in the main repository under <code>staging/X.Y</code>. For example: +</p> +<pre> + staging/18.1 - WIP branch for the 18.1 series + staging/18.2 - WIP branch for the 18.2 series +</pre> + +<p> +Notes: +</p> +<ul> +<li>People are encouraged to test the branch and report regressions.</li> +<li>The branch history is not stable and it <strong>will</strong> be rebased,</li> +</ul> + <h1 id="branch">Making a branchpoint</h1> diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html index e5350bdb2c..d7ea0a310d 100644 --- a/docs/submittingpatches.html +++ b/docs/submittingpatches.html @@ -251,6 +251,9 @@ If you are not the author of the original patch, please Cc: them in your nomination request. </p> +<p> +The current patch status can be observed in the <a href="releasing.html#stagingbranch">staging branch</a>. +</p> <h3 id="thetag">The stable tag</h3> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
