You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/09/23 11:32:18 UTC
svn commit: r1841747 - in /subversion/site/staging: ./ docs/community-guide/
docs/release-notes/
Author: stsp
Date: Sun Sep 23 11:32:18 2018
New Revision: 1841747
URL: http://svn.apache.org/viewvc?rev=1841747&view=rev
Log:
sync merge from publish to staging
Modified:
subversion/site/staging/ (props changed)
subversion/site/staging/doap.rdf
subversion/site/staging/docs/community-guide/releasing.part.html
subversion/site/staging/docs/community-guide/releasing.toc.html
subversion/site/staging/docs/release-notes/1.11.html
subversion/site/staging/docs/release-notes/index.html
subversion/site/staging/faq.html
subversion/site/staging/packages.html
subversion/site/staging/quick-start.html
subversion/site/staging/roadmap.html (contents, props changed)
subversion/site/staging/site-nav.html
Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 23 11:32:18 2018
@@ -1 +1 @@
-/subversion/site/publish:1812681-1837959
+/subversion/site/publish:1812681-1841746
Modified: subversion/site/staging/doap.rdf
URL: http://svn.apache.org/viewvc/subversion/site/staging/doap.rdf?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/doap.rdf (original)
+++ subversion/site/staging/doap.rdf Sun Sep 23 11:32:18 2018
@@ -37,22 +37,15 @@
<release>
<Version>
<name>Recommended current 1.10 release</name>
- <created>2018-04-12</created>
- <revision>1.10.0</revision>
+ <created>2018-07-20</created>
+ <revision>1.10.2</revision>
</Version>
</release>
<release>
<Version>
<name>Current 1.9 release</name>
- <created>2017-08-10</created>
- <revision>1.9.7</revision>
- </Version>
- </release>
- <release>
- <Version>
- <name>Current 1.8 release</name>
- <created>2017-08-10</created>
- <revision>1.8.19</revision>
+ <created>2018-07-20</created>
+ <revision>1.9.9</revision>
</Version>
</release>
<repository>
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=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Sun Sep 23 11:32:18 2018
@@ -713,6 +713,10 @@ from the <tt>COMMITTERS</tt> file in tru
<pre>sed -e '/^ *Translat.*:$/,/:$/!d' -e 's/^ *[^ ]* *\([^>]*>\).*/\1/;t;d' COMMITTERS</pre>
+<p>Include a translation status report produced by:</p>
+
+<pre>./tools/po/l10n-report.py</pre>
+
<p>This should be done after all localised strings have stabilised in
their final form for the release, but sufficiently in advance of the
actual release to allow the translators to do their work. As a rule of
@@ -1195,10 +1199,13 @@ update links to the release announcement
<p>In addition, if this is a new minor release X.Y.0:</p>
<ul>
- <li><p>Update the community release support levels on
+ <li><p>Update the community release support levels on the "Supported Versions"
+ section of
<a href="/docs/release-notes/#supported-versions"
><tt>^/subversion/site/publish/docs/release-notes/index.html</tt></a>
</p></li>
+ <li><p>Update <tt>supported_release_lines</tt> in release.py, removing old
+ lines as necessary.</p></li>
<li><p>Remove the "draft" warning from
<tt>^/subversion/site/publish/docs/release-notes/X.Y.html</tt>
</p></li>
@@ -1247,6 +1254,12 @@ minor release is a good time to start pr
that this is flexible, depending on what features are being
developed.</p>
+<div class="h3" id="before-branching">
+<h3>Preparing to create a new minor release branch
+ <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE" -->#before-branching"
+ title="Link to this section">¶</a>
+</h3>
+
<ul>
<li><p>Review the <a href="/roadmap">Roadmap</a>. Should any of the outstanding
items be addressed before branching?</p></li>
@@ -1279,6 +1292,14 @@ developed.</p>
>tests against the incumbent minor release</a>.</p></li>
</ul>
+</div> <!-- before-branching -->
+
+<div class="h3" id="creating-branch">
+<h3>Creating a new minor release branch
+ <a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE" -->#creating-branch"
+ title="Link to this section">¶</a>
+</h3>
+
<p>Once people agree that a new release branch should be made, the
Release Manager creates it with the following procedure (substitute
A.B with the version you're preparing, eg. 1.3, or 2.0).</p>
@@ -1355,14 +1376,13 @@ A.B with the version you're preparing, e
</ul>
-</div> <!-- release-branches -->
-
+</div> <!-- creating-branch -->
-<div class="h2" id="porting-changes">
-<h2>Porting changes to release branches
+<div class="h3" id="porting-changes">
+<h3>Porting changes to a release branch
<a class="sectionlink" href="<!--#echo var="GUIDE_RELEASING_PAGE" -->#porting-changes"
title="Link to this section">¶</a>
-</h2>
+</h3>
<p>Once a release branch has been created, no development <i>ever</i>
takes place there. The only changes permitted are ones made to
@@ -1378,6 +1398,8 @@ release stabilization section</a>.</p>
</div> <!-- porting-changes -->
+</div> <!-- release-branches -->
+
<div class="h2" id="the-changes-file">
<h2>Managing the CHANGES file
Modified: subversion/site/staging/docs/community-guide/releasing.toc.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.toc.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/releasing.toc.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.toc.html Sun Sep 23 11:32:18 2018
@@ -17,7 +17,11 @@
<li><a href="#releasing-release">The actual releasing</a></li>
</ul>
<li><a href="#release-branches">Creating and maintaining release branches</a></li>
-<li><a href="#porting-changes">Porting changes to release branches</a></li>
+ <ul>
+ <li><a href="#before-branching">Preparing to create a new minor release branch</a></li>
+ <li><a href="#creating-branch">Creating a new minor release branch</a></li>
+ <li><a href="#porting-changes">Porting changes to a release branch</a></li>
+ </ul>
<li><a href="#the-changes-file">Managing the CHANGES file</a></li>
<ul>
<li><a href="#writing-initial-changes">Writing the initial content for a branch</a></li>
Modified: subversion/site/staging/docs/release-notes/1.11.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Sun Sep 23 11:32:18 2018
@@ -35,6 +35,12 @@
</h2>
<ul>
+ <li><a href="#shelving"
+ >Improved Shelving (experimental)</a></li>
+ <li><a href="#checkpointing"
+ >Checkpointing (experimental)</a></li>
+ <li><a href="#conflict-resolver"
+ >Improvements to the Conflict Resolver</a></li>
<li><a href="#enhancements"
>Many enhancements and bug fixes</a></li>
<li><a href="#issues"
@@ -104,6 +110,22 @@ and what impact these changes may have.<
<th>Minimum Server</th>
<th>Minimum Repository</th>
<th>Notes</th></tr>
+ <tr>
+ <td>
+ <a href="#shelving">Shelving (experimental)</a>
+ </td>
+ <td>1.11</td>
+ <td>any</td>
+ <td>any</td>
+ <td>Shelving in 1.11 is incompatible with shelves created by 1.10.</td></tr>
+ <tr>
+ <td>
+ <a href="#checkpointing">Checkpointing (experimental)</a>
+ </td>
+ <td>1.11</td>
+ <td>any</td>
+ <td>any</td>
+ <td></td></tr>
</table>
</div> <!-- new-feature-compatibility-table -->
@@ -175,6 +197,59 @@ PGP digital signatures and SHA-512 check
title="Link to this section">¶</a>
</h2>
+<div class="h3" id="checkpointing">
+<h3>Checkpointing (experimental)
+ <a class="sectionlink" href="#checkpointing"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>Checkpointing (<a
+href="https://issues.apache.org/jira/browse/SVN-3626">issue #3626</a>)
+is the ability to save a snapshot of an uncommitted change in the WC from
+time to time, and later restore the working copy to one of those previous
+snapshots.</p>
+
+<div class="notice">
+ <p><span style="color: red"><b>WARNING:</b></span> The checkpointing feature
+ is designated "EXPERIMENTAL" in 1.11. It is being released in an early form
+ while development continues. It is expected to change significantly during
+ and after the 1.11.x series. There is no promise of backward compatibility
+ while it remains experimental.</p>
+</div>
+
+<p>The implementation is based on letting a shelf contain multiple
+versions. Therefore, see also <a href="#shelving"> Shelving</a>.</p>
+
+<p>The main checkpointing operations are, as listed in <a href="https://cwiki.apache.org/confluence/x/70cYBQ">the Wiki page</a>:</p>
+
+<table>
+<tr><th>Save a checkpoint</th>
+ <td><tt>svn shelf-save foo</tt></td>
+ <td>copy the local changes into a new version of shelf 'foo'<br/>
+ doesn't revert the changes from the WC</td>
+</tr>
+<tr><th></th>
+ <td><tt>svn shelve foo</tt></td>
+ <td>move the local changes into a new version of shelf 'foo'<br/>
+ and revert the changes from the WC</td>
+</tr>
+<tr><th>Restore / roll back</th>
+ <td><tt>svn unshelve foo 3</tt></td>
+ <td>unshelve version 3 of shelf 'foo'<br/>
+ and delete any newer versions</td>
+</tr>
+<tr><th>Review checkpoints</th>
+ <td><tt>svn shelf-log foo</tt></td>
+ <td>list all the versions of shelf 'foo'</td>
+</tr>
+<tr><th></th>
+ <td><tt>svn shelf-diff foo 3</tt></td>
+ <td>show version 3 as a diff</td>
+</tr>
+</table>
+
+</div> <!-- checkpointing -->
+
</div> <!-- new-features -->
<div class="h2" id="enhancements">
@@ -192,6 +267,139 @@ PGP digital signatures and SHA-512 check
title="Link to this section">¶</a>
</h3>
+<div class="h4" id="shelving">
+<h4>Improved Shelving (experimental)
+ <a class="sectionlink" href="#shelving"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>Shelving (<a href="https://issues.apache.org/jira/browse/SVN-3625">issue
+#3625</a>), first introduced in Subversion 1.10, is improved in 1.11 to
+handle more kinds of changes more robustly.</p>
+
+<div class="notice">
+ <p><span style="color: red"><b>WARNING:</b></span> The shelving feature is
+ designated "EXPERIMENTAL" in 1.11. It is being released in an early form
+ while development continues. It is expected to change significantly during
+ and after the 1.11.x series. There is no promise of backward compatibility
+ while it remains experimental.</p>
+</div>
+
+<p>Shelving in 1.11 is incompatible with shelves created by 1.10.</p>
+
+<p>The main improvements and changes are:</p>
+<ul>
+ <li>checkpointing support: a shelf stores multiple versions of a
+ change and allows unshelving an older version</li>
+ <li>'binary' files (and property values) are fully supported</li>
+ <li>patch files are no longer used as the storage mechanism;
+ limitations and bugs due to patch file format are gone, such as
+ handling svn:mergeinfo properties, binary data, and end-of-line
+ characters</li>
+ <li>shelving to a given shelf name saves a new version of the changes
+ each time, and the older versions can be retrieved—see the
+ <a href="#checkpointing">checkpointing</a> feature</li>
+ <li>shelving and unshelving both warn and refuse to run if they detect
+ states that they cannot handle (e.g. copies or moves)</li>
+ <li>unshelving applies the changes to the WC using a mechanism similar
+ to merging, so that changes can be more robustly applied when the
+ WC has been modified (e.g. updated) since the shelf was saved</li>
+</ul>
+
+<p>The kinds of change you can shelve are committable changes to files and
+properties, except the following kinds which are not yet supported:</p>
+<ul>
+ <li>copies and moves</li>
+ <li>mkdir and rmdir</li>
+</ul>
+
+<p>Shelving commands (see their help for details):</p>
+<ul>
+ <li><tt>svn shelf-diff</tt></li>
+ <li><tt>svn shelf-drop</tt></li>
+ <li><tt>svn shelf-list, shelves</tt></li>
+ <li><tt>svn shelf-list-by-paths</tt></li>
+ <li><tt>svn shelf-log</tt></li>
+ <li><tt>svn shelf-save</tt></li>
+ <li><tt>svn shelve</tt></li>
+ <li><tt>svn unshelve</tt></li>
+</ul>
+
+<p>Experimental commands are listed in the help with an '<tt>x-</tt>' prefix
+(for example, <tt>x-shelve</tt>) and can be used with or without the
+prefix.</p>
+
+<p>A migration guide for users of the Subversion 1.10 shelving commands:</p>
+<table>
+<tr><th>Subversion 1.10 command</th>
+ <th>Subversion 1.11 equivalent</th></tr>
+<tr><td><tt>svn shelve [--keep-local] SHELF [PATH...]</tt></td>
+ <td>works similarly; saves a new version each time it is used</td></tr>
+<tr><td><tt>svn unshelve [SHELF]</tt></td>
+ <td><tt>svn unshelve --drop [SHELF]</tt></td></tr>
+<tr><td><tt>svn unshelve --keep-shelved [SHELF]</tt></td>
+ <td><tt>svn unshelve [SHELF]</tt></td></tr>
+<tr><td><tt>svn shelve --delete SHELF</tt></td>
+ <td><tt>svn shelf-drop SHELF</tt></td></tr>
+<tr><td><tt>svn shelves</tt> or <tt>svn shelve --list</tt></td>
+ <td><tt>svn shelves</tt> or <tt>svn shelf-list</tt></td></tr>
+</table>
+
+<p>Further information can be found in the Subversion Wiki under
+<a href="https://cwiki.apache.org/confluence/display/SVN/Shelving+and+Checkpointing">Shelving and Checkpointing</a>.
+</p>
+
+</div> <!-- shelving -->
+
+<div class="h4" id="conflict-resolver">
+<h4>Improvements to the interactive conflict resolver
+ <a class="sectionlink" href="#conflict-resolver"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>See in particular
+<a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>
+"Unresolvable tree conflict when cherrypicking a file-edit after file was
+moved on source branch" and
+<a href="https://issues.apache.org/jira/browse/SVN-4766">issue #4766</a>
+"resolver adds unrelated moves to move target list".</p>
+
+</div> <!-- conflict-resolver -->
+
+<div class="h4" id="viewspec-output">
+<h4>Viewspec output command (experimental)
+ <a class="sectionlink" href="#viewspec-output"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>An experimental '<tt>svn info --viewspec</tt>' command outputs a view
+spec describing the current WC shape, in the format used by the old script
+<a href="http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-viewspec.py">tools/client-side/svn-viewspec.py</a>.
+See <a href="https://issues.apache.org/jira/browse/SVN-4753">issue #4753</a>
+"SVN viewspec feature".</p>
+
+</div> <!-- viewspec-output -->
+
+<div class="h4" id="info-show-item">
+<h4>Additions to <tt>svn info --show-item</tt>
+ <a class="sectionlink" href="#info-show-item"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>Add '<tt>schedule</tt>' and '<tt>depth</tt>' items to '<tt>svn info --show-item</tt>' (<a href="http://svn.apache.org/r1827032">r1827032</a>).</p>
+
+</div> <!-- info-show-item -->
+
+<div class="h4" id="save-client-cert-pw">
+<h4>Allow the client cert password to be saved
+ <a class="sectionlink" href="#save-client-cert-pw"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>Allow the client cert password to be saved (<a href="http://svn.apache.org/r1836762">r1836762</a>).</p>
+
+</div> <!-- save-client-cert-pw -->
+
</div> <!-- cmdline -->
<div class="h3" id="server-side-improvements">
Modified: subversion/site/staging/docs/release-notes/index.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/index.html (original)
+++ subversion/site/staging/docs/release-notes/index.html Sun Sep 23 11:32:18 2018
@@ -42,6 +42,7 @@ official support status for the various
<p>Here are the release notes for the major Subversion releases:</p>
<ul>
+<li><a href="1.11.html">Subversion 1.11</a> â Improved shelving, checkpointing, improved tree conflict resolution (<i><b>planned release date â October ~ November, 2018</b></i>)</li>
<li><a href="1.10.html">Subversion 1.10</a> â Improved path-based authz, new interactive conflict resolver, LZ4 compression, FSFS format 8, shelving (<i>first released â April 12, 2018</i>)</li>
<li><a href="1.9.html">Subversion 1.9</a> â FSFS format 7, FSX (<i>first released â August 5, 2015</i>)</li>
<li><a href="1.8.html">Subversion 1.8</a> â Automatic merge, client-side rename tracking, inherited properties (<i>first released â June 18, 2013</i>)</li>
Modified: subversion/site/staging/faq.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/faq.html (original)
+++ subversion/site/staging/faq.html Sun Sep 23 11:32:18 2018
@@ -672,16 +672,23 @@ For more information, see
title="Link to this section">¶</a>
</h3>
-<p>Vectorized versions of the Subversion logo are available in the <a
-href="https://svn.apache.org/repos/asf/subversion/site/publish">logo directory of the www
-tree</a> of the <a href="https://svn.apache.org/repos/asf/subversion/trunk">Subversion
-repository</a>.</p>
+<p>The following versions of the Subversion logo are available:</p>
-<p>Specifically, an <a
-href="https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.eps">EPS
-version</a>, as well as an <a
+<ul>
+<li>An <a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/subversion_logo.svg"
+><acronym title="Scalable Vector Graphics">SVG</acronym> version</a></li>
+<li>An <a
+href="https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.eps"
+><acronym title="Encapulated PostScript">EPS</acronym> version</a></li>
+<li>An <a
href="https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.ai">Adobe
-Illustrator document</a> are available.</p>
+Illustrator document</a></li>
+</ul>
+
+<p>Some additional artwork is available in Subversion's source tree under
+<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/">notes/logo</a>
+and in
+<a href="/logo/">this Web site</a>.</p>
</div>
Modified: subversion/site/staging/packages.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/packages.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/packages.html (original)
+++ subversion/site/staging/packages.html Sun Sep 23 11:32:18 2018
@@ -25,8 +25,7 @@
<div class="bigpoint">
<p>Find packages for your operating system:</p>
-<p><a href="#aix">AIX</a> |
- <a href="#centos">Centos Linux</a> |
+<p><a href="#centos">Centos Linux</a> |
<a href="#debian">Debian Linux</a> |
<a href="#fedora">Fedora Linux</a> |
<a href="#freebsd">FreeBSD</a> |
@@ -71,25 +70,6 @@
facilitate that for you.</p>
-<div class="h2" id="aix">
-<h2>AIX
- <a class="sectionlink" href="#aix"
- title="Link to this section">¶</a>
-</h2>
-<div class="package" style="background-image: url('/images/aix.png');">
-
-<ul>
-<li><p><a href="http://www.perzl.org/aix/index.php?n=Main.Subversion"
- >AIX Open Source Packages</a> (maintained by
- <a href="mailto:michael@perzl.org"
- >Michael Perzl</a>)</p>
-</li>
-</ul>
-
-</div> <!-- .package -->
-</div> <!-- #aix -->
-
-
<div class="h2" id="centos">
<h2>Centos Linux
<a class="sectionlink" href="#centos"
@@ -113,13 +93,6 @@ $ yum install mod_dav_svn</pre>
<a href="https://www.wandisco.com/subversion/"
>WANdisco</a>; <em>requires registration</em>)</p>
</li>
-<li><p><a href="http://pkgs.repoforge.org/subversion/">
- Repoforge</a> (client and server;
- maintained by the <a href="http://www.repoforge.org/"
- >Repoforge project</a>;
- see the <a href="http://repoforge.org/use/">repoforge user guide</a>
- for details)</p>
-</li>
</ul>
</div> <!-- .package -->
@@ -334,22 +307,11 @@ $ yum install mod_dav_svn</pre>
<a href="https://www.collab.net/subversion"
>CollabNet</a>; <em>requires registration</em>)</p>
</li>
-<li><p><a href="https://the.earth.li/pub/subversion/summersoft.fay.ar.us/pub/subversion/latest/"
- >SummerSoft</a> (Red Hat 8,9+; maintained by
- <a href="mailto:david@summersoft.fay.ar.us">David Summers</a>)</p>
-</li>
<li><p><a href="https://www.wandisco.com/subversion/download#redhat">
WANdisco</a> (supported and certified by
<a href="https://www.wandisco.com/subversion/"
>WANdisco</a>; <em>requires registration</em>)</p>
</li>
-<li><p><a href="http://pkgs.repoforge.org/subversion/">
- Repoforge</a> (client and server;
- maintained by the <a href="http://www.repoforge.org/"
- >Repoforge project</a>;
- see the <a href="http://repoforge.org/use/">repoforge user guide</a>
- for details)</p>
-</li>
</ul>
</div> <!-- .package -->
@@ -369,11 +331,6 @@ $ yum install mod_dav_svn</pre>
<a href="https://www.collab.net/subversion"
>CollabNet</a>; <em>requires registration</em>)</p>
</li>
-<li><p><a href="https://www.opencsw.org/packages/subversion/"
- >OpenCSW</a> (SPARC/i386;
- <a href="https://www.opencsw.org/maintainers/rupert/"
- >Rupert Thurner</a>)</p>
-</li>
<li><p><a href="https://www.wandisco.com/subversion/download#solaris">
WANdisco</a> (supported and certified by
<a href="https://www.wandisco.com/subversion/"
@@ -488,10 +445,12 @@ $ apt-get install libapache2-svn</pre>
<a href="https://www.wandisco.com/subversion/"
>WANdisco</a>; <em>requires registration</em>)</p>
</li>
+<!--
<li><p><a href="https://sourceforge.net/projects/win32svn/"
>Win32Svn</a> (32-bit client, server and bindings, MSI and ZIPs;
maintained by <a href="https://alagazam.net/">David Darj</a>)</p>
</li>
+-->
</ul>
</div> <!-- .package -->
Modified: subversion/site/staging/quick-start.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/quick-start.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/quick-start.html (original)
+++ subversion/site/staging/quick-start.html Sun Sep 23 11:32:18 2018
@@ -91,7 +91,7 @@ data in form of revisions.</p>
<li>svnserve:
<tt>svn://svn.example.com/repos/MyRepo/MyProject/branches/MyBranch</tt></li>
<li>Direct access (Unix-style):
- <tt>file://var/svn/repos/MyRepo/MyProject/tags/1.1.0</tt></li>
+ <tt>file:///var/svn/repos/MyRepo/MyProject/tags/1.1.0</tt></li>
<li>Direct access (Windows-style):
<tt>file:///C:/Repositories/MyRepo/trunk/MyProject</tt></li>
</ul>
Modified: subversion/site/staging/roadmap.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/roadmap.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/roadmap.html (original)
+++ subversion/site/staging/roadmap.html Sun Sep 23 11:32:18 2018
@@ -19,7 +19,7 @@
<h1>Apache Subversion Roadmap</h1>
<div class="notice">
-<p>New 6-month standard and 2-year LTS release schedule</p>
+<p>New 6-month standard and 2-year LTS release schedule <a href="news.html#news-20180622">announced</a>: details below in <a href="#release-planning">How We Plan Releases</a></p>
</div>
<div class="h2" id="upcoming-releases">
@@ -50,30 +50,19 @@
</thead>
<tbody>
<tr>
- <td>2018-04-13</td>
- <td>Release 1.10.0 LTS</td>
- <td><a href="/docs/release-notes/1.10.html"
- >1.10 release notes</a>
- <a href="https://issues.apache.org/jira/browse/SVN-4712"
- >issue SVN-4712 "Release 1.10"</a>
- <a href="/download.html"
- >downloads</a>
- </td>
- </tr>
- <tr>
- <td>2018-07-20</td>
- <td>Release 1.10.2</td>
- <td>maintenance release. (1.10.1 was not released.)</td>
+ <td>2018-09-xx</td>
+ <td>Release 1.11.0-rc1</td>
+ <td></td>
</tr>
<tr>
- <td>2018-07-20</td>
- <td>Release 1.9.9</td>
- <td>maintenance release. (1.9.8 was not released.)</td>
+ <td>2018-09-xx</td>
+ <td>Release 1.11.0-rc2</td>
+ <td></td>
</tr>
<tr>
- <td>2018-10</td>
+ <td>2018-10+</td>
<td>Release 1.11.0</td>
- <td>better <a href="https://issues.apache.org/jira/browse/SVN-3625">shelving</a>, <a href="https://issues.apache.org/jira/browse/SVN-3626">checkpointing</a>, ...</td>
+ <td><a href="docs/release-notes/1.11.html">1.11 Release Notes</a></td>
</tr>
<tr>
<td>2019-04</td>
@@ -242,13 +231,13 @@ better plan their upgrade cycles, partic
<tr>
<td>Shelve</td>
<td></td>
- <td>1.10</td>
+ <td>1.10 ...</td>
<td><a href="https://issues.apache.org/jira/browse/SVN-3625">3625</a></td>
</tr>
<tr>
<td>Checkpoint</td>
<td></td>
- <td>1.11?</td>
+ <td>1.11 ...</td>
<td><a href="https://issues.apache.org/jira/browse/SVN-3626">3626</a></td>
</tr>
<tr>
@@ -311,7 +300,7 @@ better plan their upgrade cycles, partic
release</td></tr>
<tr class="task-level-1 in-progress">
- <td class="task-name">Commit shelving (improved since 1.10)</td>
+ <td class="task-name">Shelving improvements</td>
<td class="task-status">In progress</td>
<td><a href="https://issues.apache.org/jira/browse/SVN-3625"
>Issue 3625</a>
@@ -319,7 +308,7 @@ better plan their upgrade cycles, partic
</td>
</tr>
<tr class="task-level-1 in-progress">
- <td class="task-name">Commit checkpointing</td>
+ <td class="task-name">Checkpointing</td>
<td class="task-status">In progress</td>
<td><a href="https://issues.apache.org/jira/browse/SVN-3626"
>Issue 3626</a>
Propchange: subversion/site/staging/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 23 11:32:18 2018
@@ -0,0 +1,2 @@
+/subversion/site/publish/roadmap.html:1812681-1841746
+/subversion/site/staging/roadmap.html:1812681-1812682
Modified: subversion/site/staging/site-nav.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/site-nav.html?rev=1841747&r1=1841746&r2=1841747&view=diff
==============================================================================
--- subversion/site/staging/site-nav.html (original)
+++ subversion/site/staging/site-nav.html Sun Sep 23 11:32:18 2018
@@ -13,7 +13,12 @@
</ul>
</li>
<li>Getting Subversion
- <ul>
+ <ul>
+ <!-- The ?update= parameter is used to only offer mirrors that have
+ synced after the specified date. We update it after a security
+ release when the email announcement is less than 24 hours after
+ the upload to /dist/release, in order to prevent offering mirrors
+ that don't carry the just-released artifacts. -->
<li><a href="/download.cgi?update=201708081800">Source Download</a></li>
<li><a href="/packages.html">Binary Packages</a></li>
<li><a href="/docs/release-notes/">Release Notes</a></li>