Author: luke1410 Date: Mon Dec 11 22:34:09 2017 New Revision: 1817860 URL: http://svn.apache.org/viewvc?rev=1817860&view=rev Log: * site/staging: Catch-up merge from 'publish'
Modified: subversion/site/staging/ (props changed) subversion/site/staging/docs/community-guide/releasing.part.html Propchange: subversion/site/staging/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 11 22:34:09 2017 @@ -1 +1 @@ -/subversion/site/publish:1812681-1815119,1816621,1817056 +/subversion/site/publish:1812681-1815119,1816621,1817056,1817775-1817848 Modified: subversion/site/staging/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1817860&r1=1817859&r2=1817860&view=diff ============================================================================== --- subversion/site/staging/docs/community-guide/releasing.part.html (original) +++ subversion/site/staging/docs/community-guide/releasing.part.html Mon Dec 11 22:34:09 2017 @@ -1245,7 +1245,7 @@ A.B with the version you're preparing, e <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>build/run_tests.py</tt> and +<li><p>Edit <tt>subversion/tests/cmdline/svntest/main.py</tt> on trunk and increment <tt>SVN_VER_MINOR</tt>. Do not commit these changes yet.</p></li> @@ -1268,13 +1268,12 @@ A.B with the version you're preparing, e Increment the trunk version number, and introduce a new CHANGES section for the upcoming A.B.0 release. - * subversion/include/svn_version.h: Increment version number. - - * subversion/tests/cmdline/svntest/main.py (SVN_VER_MINOR), - build/run_tests.py (SVN_VER_MINOR): + * 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. - * CHANGES: New section for A.B.0. + * CHANGES: New section for A.$((B+1)).0. </pre></li> <li><p>Create a new <tt>STATUS</tt> file on the release branch.</p></li> @@ -1282,6 +1281,8 @@ A.B with the version you're preparing, e <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> + </ul> </div> <!-- release-branches -->