Author: luke1410 Date: Wed Dec 13 23:27:40 2017 New Revision: 1818082 URL: http://svn.apache.org/viewvc?rev=1818082&view=rev Log: * site/staging: Catch-up merge from 'publish'
Added: subversion/site/staging/docs/api/1.6/ - copied from r1818079, subversion/site/publish/docs/api/1.6/ subversion/site/staging/docs/javahl/1.6/ - copied from r1818079, subversion/site/publish/docs/javahl/1.6/ Modified: subversion/site/staging/ (props changed) subversion/site/staging/docs/community-guide/releasing.part.html subversion/site/staging/docs/community-guide/web.part.html subversion/site/staging/docs/release-notes/1.10.html subversion/site/staging/roadmap.html Propchange: subversion/site/staging/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 13 23:27:40 2017 @@ -1 +1 @@ -/subversion/site/publish:1812681-1815119,1816621,1817056,1817775-1817848 +/subversion/site/publish:1812681-1815119,1816621,1817056,1817775-1817848,1817994,1817996,1818002,1818011-1818012,1818016,1818079 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=1818082&r1=1818081&r2=1818082&view=diff ============================================================================== --- subversion/site/staging/docs/community-guide/releasing.part.html (original) +++ subversion/site/staging/docs/community-guide/releasing.part.html Wed Dec 13 23:27:40 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,19 @@ 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> + + <p>Someone needs to run the 'svn checkout' manually. + 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> + </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> Modified: subversion/site/staging/docs/community-guide/web.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/web.part.html?rev=1818082&r1=1818081&r2=1818082&view=diff ============================================================================== --- subversion/site/staging/docs/community-guide/web.part.html (original) +++ subversion/site/staging/docs/community-guide/web.part.html Wed Dec 13 23:27:40 2017 @@ -109,10 +109,6 @@ ServerAdmin webmaster@localhost DocumentRoot /home/user/projects/svn/site/publish - <Directory /> - Options +Includes - AddOutputFilter INCLUDES .html - </Directory> <Directory /home/user/projects/svn/site/publish/> Options +Includes AddOutputFilter INCLUDES .html Modified: subversion/site/staging/docs/release-notes/1.10.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1818082&r1=1818081&r2=1818082&view=diff ============================================================================== --- subversion/site/staging/docs/release-notes/1.10.html (original) +++ subversion/site/staging/docs/release-notes/1.10.html Wed Dec 13 23:27:40 2017 @@ -41,6 +41,8 @@ >New interactive conflict resolver</a></li> <li><a href="#lz4" >LZ4 Compression</a></li> + <li><a href="#shelving" + >Shelving</a></li> <li><a href="#enhancements" >Many enhancements and bug fixes</a></li> <li><a href="#issues" @@ -553,6 +555,8 @@ format number of a repository.)</p> for pre-releases</a> for additional information.</p> </div> +</div> <!-- fsfs-format8 --> + <div class="h4" id="fsfs-lz4-configuration"> <h4>Configuring the repository to use LZ4 compression <a class="sectionlink" href="#fsfs-format8" @@ -577,10 +581,20 @@ by performing a full <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin">dump/load</a> cycle into a new format 8 repository created with Subversion 1.10. -</div> <!-- fsfs-format8 --> +</div> <!-- fsfs-lz4-configuration --> </div> <!-- lz4 --> +<div class="h3" id="shelving"> +<h3>Shelving + <a class="sectionlink" href="#shelving" + title="Link to this section">¶</a> +</h3> + +<p>svn shelve, svn unshelve, svn shelves</p> + +</div> <!-- shelving --> + </div> <!-- new-features --> <div class="h2" id="enhancements"> Modified: subversion/site/staging/roadmap.html URL: http://svn.apache.org/viewvc/subversion/site/staging/roadmap.html?rev=1818082&r1=1818081&r2=1818082&view=diff ============================================================================== --- subversion/site/staging/roadmap.html (original) +++ subversion/site/staging/roadmap.html Wed Dec 13 23:27:40 2017 @@ -182,7 +182,7 @@ numbering, compatibility, and deprecatio <tr> <td>Shelve</td> <td></td> - <td>1.11?</td> + <td>1.10?</td> <td><a href="https://issues.apache.org/jira/browse/SVN-3625">3625</a></td> </tr> <tr> @@ -277,6 +277,16 @@ numbering, compatibility, and deprecatio <td>Status in 1.10 will still be <i>"experimental"</i>.</td> </tr> + <tr class="task-level-1 in-progress"> + <td class="task-name">Commit shelving</td> + <td class="task-status"> + <a href="/docs/release-notes/1.10.html#shelving" + >In progress</a></td> + <td>Status in 1.10 will be <i>"experimental"</i>. + <a href="https://issues.apache.org/jira/browse/SVN-3625" + >Issue 3625</a></td> + </tr> + <!-- PUT DEFERRED ITEMS DOWN HERE BELOW THIS DIVIDER ROW --> <tr><td colspan="3" class="divider">Items originally planned for, but now deferred from, this release</td></tr> @@ -300,10 +310,9 @@ numbering, compatibility, and deprecatio >Issue 3633</a></td> </tr> <tr class="task-level-1 not-started"> - <td class="task-name">Commit shelving / checkpointing</td> + <td class="task-name">Commit checkpointing</td> <td class="task-status">Not started</td> - <td><a href="https://issues.apache.org/jira/browse/SVN-3625" - >Issue 3625</a> and <a href="https://issues.apache.org/jira/browse/SVN-3626" + <td><a href="https://issues.apache.org/jira/browse/SVN-3626" >Issue 3626</a></td> </tr> <tr class="task-level-1 exlored">