You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2017/12/13 10:11:18 UTC
svn commit: r1817994 -
/subversion/site/publish/docs/community-guide/releasing.part.html
Author: julianfoad
Date: Wed Dec 13 10:11:18 2017
New Revision: 1817994
URL: http://svn.apache.org/viewvc?rev=1817994&view=rev
Log:
* publish/docs/community-guide/releasing.part.html
(release-branches): Update following r1817921. Add instructions for
updating the buildbot and backport mergebot configs.
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=1817994&r1=1817993&r2=1817994&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Wed Dec 13 10:11:18 2017
@@ -1241,9 +1241,9 @@ A.B with the version you're preparing, e
created a branch (eg. 2.1.0 for the 2.0.x branch, and 1.4.0 for
the 1.3.x branch).</p></li>
-<li><p>Edit <tt>/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java</tt> on trunk and
- <a href="https://svn.apache.org/r1483917">increment the version numbers in
- <tt>init()</tt></a>. Do not commit these changes yet.</p></li>
+<li><p>Edit <tt>subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java</tt>
+ on trunk and increment <tt>SVN_VER_MINOR</tt>. Do not commit these changes
+ yet.</p></li>
<li><p>Edit
<tt>subversion/tests/cmdline/svntest/main.py</tt> on trunk and
@@ -1265,13 +1265,13 @@ A.B with the version you're preparing, e
<li><p>Commit these changes with a log message something like the
following:</p>
<pre>
- Increment the trunk version number, and introduce a new CHANGES
- section for the upcoming A.B.0 release.
+ Increment the trunk version number to A.$((B+1)), and introduce a new CHANGES
+ section, following the creation of the A.B.x release branch.
- * subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
- subversion/include/svn_version.h (SVN_VER_MINOR),
- subversion/tests/cmdline/svntest/main.py (SVN_VER_MINOR):
- Increment version number.
+ * subversion/include/svn_version.h,
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
+ subversion/tests/cmdline/svntest/main.py
+ (SVN_VER_MINOR): Increment to $((B+1)).
* CHANGES: New section for A.$((B+1)).0.
</pre></li>
@@ -1279,9 +1279,13 @@ A.B with the version you're preparing, e
<li><p>Create a new <tt>STATUS</tt> file on the release branch.</p></li>
<li><p>Ask someone with appropriate access to add the A.B.x branch to the
- <tt>svn-role</tt> mergebot.</p></li>
-
-<li><p>Make sure all buildbot builders are building the new release branch.</p></li>
+ <tt>svn-role</tt> backport mergebot:</p>
+ <p>Submit a pull-request on GitHub to add 'A.B.x' to the list in <a
+ href="https://github.com/apache/infrastructure-puppet/edit/deployment/modules/svnqavm_pvm_asf/manifests/init.pp">https://github.com/apache/infrastructure-puppet/edit/deployment/modules/svnqavm_pvm_asf/manifests/init.pp</a></p></li>
+
+<li><p>Make sure all buildbot builders are building the new release branch.</p>
+ <p>Add A.B to the MINOR_LINES list in <a
+ href="https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf">https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf</a>.</p></li>
</ul>