Author: julianfoad Date: Mon Sep 30 14:06:37 2019 New Revision: 1867775 URL: http://svn.apache.org/viewvc?rev=1867775&view=rev Log: * publish/docs/community-guide/releasing.part.html (creating-branch): Move info on managing the backport merge bot... (backport-merge-bot): ... to this new section, and expand and clarify it.
Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1867775&r1=1867774&r2=1867775&view=diff ============================================================================== --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Mon Sep 30 14:06:37 2019 @@ -1503,23 +1503,51 @@ A.B with the version you're preparing, e <ul> <li> <p>Ask someone with appropriate access to add the A.B.x branch to the - <tt>svn-role</tt> backport mergebot:</p> - <p>Someone with admin access to the <tt>svn-qavm</tt> machine needs to - populate the a source directory for the new branch, by running,</p> - <pre>sudo -u svnsvn svn up ~svnsvn/src/svn/A.B.x</pre> - <p>The backport merge bot runs nightly on each such branch directory - that exists.</p> - <p>To remove a no-longer-supported branch:<p> - <pre>sudo -u svnsvn svn up -r0 ~svnsvn/src/svn/Z.Z.x</pre> - <p><i>[Obsolete note?]</i> - The exact checkout command is documented in machines/svn-qavm2/notes.txt - in the private repository (need to use a trunk client and the svn-master.a.o - hostname).</p> + <a href="#backport-merge-bot">backport merge bot</a>.</p> </li> </ul> </div> <!-- creating-branch --> +<div class="h3" id="backport-merge-bot"> +<h3>Managing the Backport Merge Bot + <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE" -->#porting-changes" + title="Link to this section">¶</a> +</h3> +<p>The backport merge bot runs nightly on the <tt>svn-qavm</tt> machine, + under the <tt>svnsvn</tt> local user account, making commits + using the <tt>svn-role</tt> Subversion account name. </p> +<p>This configuration currently requires someone with admin access to + the machine, to manage changes to the set of branches.</p> +<p>The bot merges approved backports on each branch A.B.x for which a + WC directory exists at <tt>~svnsvn/src/svn/A.B.x</tt> .</p> +<p>The checkout there was created by running (as <tt>svnsvn</tt> user, + e.g. with sudo) something like:</p> +<pre> +svn checkout --depth=empty https://svn-master.apache.org/repos/asf/subversion/branches ~svnsvn/src/svn +svn up ~svnsvn/src/svn/<i>A.B.x</i> # for each supported branch +</pre> +<p>The repo URL is <tt>svn-master.a.o</tt> because the backports merger runs + <tt>svn ci && svn up</tt> in a loop, and assumes <tt>svn up</tt> will + update it to the revision it just committed. That's not guaranteed + when updating from a mirror (and <tt>svn.a.o</tt> may point to a + mirror). The buildbot slaves do this too, for the same reason.</p> +<p>Each branch is in a subdirectory of the WC root. To add a new + branch, populate the source tree with <tt>svn up</tt>:</p> +<pre> +sudo -H -u svnsvn svn up ~svnsvn/src/svn/A.B.x +</pre> +<p>To remove a no-longer-supported branch, use <tt>svn up -r0</tt>:</p> +<pre> +sudo -H -u svnsvn svn up -r0 ~svnsvn/src/svn/Z.Z.x +</pre> +<p><i>[Historical notes can be found in <tt>machines/svn-qavm/</tt> and + <tt>machines/svn-qavm2/</tt> in the Subversion PMC's + <a href="https://svn.apache.org/repos/private/pmc/subversion"> + private repository</a>.]</i></p> + +</div> <!-- backport-merge-bot --> + <div class="h3" id="porting-changes"> <h3>Porting changes to a release branch <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE" -->#porting-changes"