Author: danielsh
Date: Mon Oct 1 13:51:29 2018
New Revision: 1842501
URL: http://svn.apache.org/viewvc?rev=1842501&view=rev
Log:
Sync-merge from publish into staging.
Modified:
subversion/site/staging/ (props changed)
subversion/site/staging/docs/release-notes/1.11.html
subversion/site/staging/docs/release-notes/index.html
subversion/site/staging/download.html
subversion/site/staging/index.html (props changed)
subversion/site/staging/news.html (props changed)
subversion/site/staging/roadmap.html (contents, props changed)
Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 13:51:29 2018
@@ -1 +1 @@
-/subversion/site/publish:1812681-1841746
+/subversion/site/publish:1812681-1842500
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=1842501&r1=1842500&r2=1842501&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Mon Oct 1 13:51:29
2018
@@ -24,10 +24,19 @@
<h1 style="text-align: center">Apache Subversion 1.11 Release Notes</h1>
<div class="notice">
-<p><span style="color: red">This is work in progress.
+<p><span style="color: red"><b>This is work in progress.
Subversion 1.11 has not been released yet.</b></span></p>
</div>
+<div class="notice">
+<p>New 6-month regular and 2-year LTS release schedule.</p>
+<p>Subversion 1.11 is the first of the new 6-month regular releases with an
+emphasis on introducing new features more quickly and a shorter support
+period. See
+<a href="#non-lts-release">Subversion 1.11 is a Regular Release</a>
+below.</p>
+</div>
+
<div class="h2" id="news">
<h2>What's New in Apache Subversion 1.11
<a class="sectionlink" href="#news"
@@ -38,7 +47,7 @@
<li><a href="#shelving"
>Improved Shelving (experimental)</a></li>
<li><a href="#checkpointing"
- >Checkpointing (experimental)</a></li>
+ >Commit checkpointing (experimental)</a></li>
<li><a href="#conflict-resolver"
>Improvements to the Conflict Resolver</a></li>
<li><a href="#enhancements"
@@ -117,10 +126,11 @@ and what impact these changes may have.<
<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>
+ <td>shelves created by 1.10 are not compatible—see
+ <a href="#shelving-transition">the transition notes</a></td></tr>
<tr>
<td>
- <a href="#checkpointing">Checkpointing (experimental)</a>
+ <a href="#checkpointing">Commit checkpointing (experimental)</a>
</td>
<td>1.11</td>
<td>any</td>
@@ -160,6 +170,50 @@ to the upgrade.</p>
</div> <!-- wc-upgrade -->
+<div class="h3" id="shelving-transition">
+<h3>Shelving: transtion from 1.10
+ <a class="sectionlink" href="#shelving-transition"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>The presence in the working copy of any shelves that were created by
+Subversion 1.10 has no effect on a Subversion 1.11 client. Subversion 1.11
+will ignore them; it cannot interoperate with them nor even list their
+presence.</p>
+
+<p>The <tt>svn upgrade</tt> command has no effect, as the working copy
+format is formally unchanged.</p>
+
+<p>Shelves are currently stored under
+<tt><i><WC></i>/.svn/experimental/shelves/</tt>. In Subversion 1.10,
+shelves were stored under <tt><i><WC></i>/.svn/shelves/</tt> as patch
+files.</p>
+
+<p>To recover a shelf created by 1.10, either
+<ul><li>use a 1.10 client to find and unshelve it, or</li>
+ <li>find the patch file by hand and use any 1.10 or later
+ <tt>svn patch</tt> to apply it.</li>
+</ul></p>
+
+<p>Differences in the main shelving commands:</p>
+
+<table>
+<tr><th>Subversion 1.10 command</th>
+ <th>Subversion 1.11 equivalent</th></tr>
+<tr><td><tt>svn [x-]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 [x-]unshelve [SHELF]</tt></td>
+ <td><tt>svn x-unshelve --drop [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]unshelve --keep-shelved [SHELF]</tt></td>
+ <td><tt>svn x-unshelve [SHELF]</tt></td></tr>
+<tr><td><tt>svn [x-]shelve --delete SHELF</tt></td>
+ <td><tt>svn x-shelf-drop SHELF</tt></td></tr>
+<tr><td><tt>svn [x-]shelves</tt> or <tt>svn [x-]shelve --list</tt></td>
+ <td><tt>svn x-shelves</tt> or <tt>svn x-shelf-list</tt></td></tr>
+</table>
+
+</div> <!-- shelving-transition -->
+
<div class="h3" id="compat-misc">
<h3>Miscellaneous Compatibility Notes
<a class="sectionlink" href="#compat-misc"
@@ -187,7 +241,7 @@ PGP digital signatures and SHA-512 check
</div> <!-- no-sha1-in-dist -->
-</div> <!-- compat-misc -- >
+</div> <!-- compat-misc -->
</div> <!-- compatibility -->
@@ -198,16 +252,15 @@ PGP digital signatures and SHA-512 check
</h2>
<div class="h3" id="checkpointing">
-<h3>Checkpointing (experimental)
+<h3>Commit 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>
+<p>Subversion 1.11 provides an experimental first cut at solving some of the
+use cases envisioned in <a
+href="https://issues.apache.org/jira/browse/SVN-3626";>issue #3626</a> named
+"Commit checkpointing".</p>
<div class="notice">
<p><span style="color: red"><b>WARNING:</b></span> The checkpointing feature
@@ -217,33 +270,46 @@ snapshots.</p>
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>
+<p>It provides the ability to save a snapshot of an uncommitted change from
+time to time, and later restore one of those previous versions of your
+change back into the working copy.</p>
+
+<p>It does not provide the kind of exact WC state roll back that is also
+discussed in that issue, that could make it possible after a messy update to
+roll back to the exact WC state that existed just before. This remains a
+future possibility.</p>
+
+<p>The ability to checkpoint and roll back an uncommitted change is provided
+within the shelving feature, by letting a shelf hold multiple versions of
+your change. Therefore, see also <a href="#shelving"> Shelving</a>.</p>
+
+<p>The main checkpointing operations are accomplished by the following
+commands, as also 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/>
+<tr><th>Save a checkpoint and continue</th>
+ <td><tt>svn x-<b>shelf-save</b> 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>
+<tr><th>Save a checkpoint and shelve</th>
+ <td><tt>svn x-<b>shelve</b> 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/>
+ <td>first revert your unwanted changes; then<br/>
+ <tt>svn x-<b>unshelve</b> foo 3</tt></td>
+ <td>apply version 3 of shelf 'foo' to the WC<br/>
and delete any newer versions</td>
</tr>
<tr><th>Review checkpoints</th>
- <td><tt>svn shelf-log foo</tt></td>
+ <td><tt>svn x-<b>shelf-log</b> 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><tt>svn x-<b>shelf-diff</b> foo 3</tt></td>
<td>show version 3 as a diff</td>
</tr>
</table>
@@ -285,20 +351,21 @@ handle more kinds of changes more robust
while it remains experimental.</p>
</div>
-<p>Shelving in 1.11 is incompatible with shelves created by 1.10.</p>
+<p>Shelving in 1.11 is incompatible with shelves created by 1.10. See
+<a href="#shelving-transition">the transition notes</a> on recovering 1.10
+shelves and differences in commands.</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>
+ change; shelving adds a new version to the named shelf; you can
+ unshelve an older version instead of the newest—see the
+ <a href="#checkpointing">checkpointing</a> feature</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
@@ -310,41 +377,21 @@ handle more kinds of changes more robust
properties, except the following kinds which are not yet supported:</p>
<ul>
<li>copies and moves</li>
- <li>mkdir and rmdir</li>
+ <li>creating and deleting directories</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>
+ <li><tt>svn x-shelf-diff</tt></li>
+ <li><tt>svn x-shelf-drop</tt></li>
+ <li><tt>svn x-shelf-list, x-shelves</tt></li>
+ <li><tt>svn x-shelf-list-by-paths</tt></li>
+ <li><tt>svn x-shelf-log</tt></li>
+ <li><tt>svn x-shelf-save</tt></li>
+ <li><tt>svn x-shelve</tt></li>
+ <li><tt>svn x-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>
@@ -368,15 +415,33 @@ moved on source branch" and
<div class="h4" id="viewspec-output">
<h4>Viewspec output command (experimental)
+ (<a href="https://issues.apache.org/jira/browse/SVN-4753";>issue #4753</a>)
<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>
+<p>There is an experimental command to write out a view spec describing the
+current WC shape.</p>
+
+<div class="notice">
+ <p><span style="color: red"><b>WARNING:</b></span> This 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>A view spec describes whether each subtree is at a limited depth, excluded,
+switched to a different URL, or updated to a different revision number,
+compared with its parent directory. This information is sometimes referred
+to as the shape or the layout of a WC.</p>
+
+<p>'<tt>svn info --x-viewspec=classic</tt>' writes 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>.</p>
+
+<p>'<tt>svn info --x-viewspec=svn11</tt>' writes a series of '<tt>svn</tt>'
+command lines. You can create a new WC of the same layout by running these
+commands.</p>
</div> <!-- viewspec-output -->
@@ -429,6 +494,26 @@ See <a href="https://issues.apache.org/j
</div> <!-- client-server-improvements -->
+<div class="h3" id="apis">
+<h3>API changes, improvements and language bindings
+ (<em>client and server</em>)
+ <a class="sectionlink" href="#apis"
+ title="Link to this section">¶</a>
+</h3>
+
+<div class="h4" id="javahl">
+<h4>JavaHL Updates
+ <a class="sectionlink" href="#javahl"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>The JavaHL bindings have been updated to be compatible with Java 10. Due
+to required build changes, JavaHL now requires at least Java 8 to compile.</p>
+
+</div> <!-- javahl -->
+
+</div> <!-- apis -->
+
</div> <!-- enhancements -->
<div class="h2" id="issues">
@@ -437,12 +522,31 @@ See <a href="https://issues.apache.org/j
title="Link to this section">¶</a>
</h2>
+<!--
<p>There are no known issues specific to this release at the moment.</p>
+-->
-<!--
<p>There are some known issues in the Subversion 1.11 releases. These
may be fixed in later 1.11.x releases.</p>
--->
+
+<div class="h3" id="ruby-swig-issue-602">
+<h3>Ruby bindings require swig 3.0.9
+ <a class="sectionlink" href="#ruby-swig-issue-602"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>The Ruby bindings are known not to build with swig version 3.0.8 (and only
+that version) due to <a href="https://github.com/swig/swig/issues/602";>swig
+issue #602</a>. We recommend to use swig 3.0.9 or newer.</p>
+
+<p>The failure is detected by the test suite.
+To test whether your version of swig is affected, run
+<tt>make check-swig-rb</tt>. (Some distros might have backported the swig
+patch into their swig-3.0.8 packages.)</p>
+
+<p>The Perl and Python bindings are not affected.</p>
+
+</div> <!-- ruby-swig-issue-602 -->
</div> <!-- issues -->
@@ -462,23 +566,25 @@ if they occur.</p>
<p>There are no known issues specific to this release at the moment.</p>
-</div> < !-- troubleshooting -- >
+</div> < ! - - troubleshooting - - >
-->
<div class="h2" id="non-lts-release">
-<h2>Subversion 1.11.x is a Regular Release
+<h2>Subversion 1.11 is a Regular Release
<a class="sectionlink" href="#non-lts-release"
title="Link to this section">¶</a>
</h2>
-<p>1.11 is a regular release, not a Long-Term Support release.
- This release does not change the status of existing LTS releases
- (1.9 and 1.10).
- See <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
-
-<p>Therefore, if you are running into an issue with the old stable
-version which has already been fixed in the latest version, we might
-ask you to upgrade to that version to resolve the issue.</p>
+<p>Subversion 1.11 is the first of the new 6-month regular releases with an
+emphasis on introducing new features more quickly and a shorter support
+period.</p>
+
+<p>Subversion 1.9 and 1.10 are still supported, now being regarded as
+long-term support (LTS) releases. The next LTS release is expected to be
+numbered 1.14, to be released two years after 1.10.</p>
+
+<p>For further details see
+<a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
</div> <!-- non-lts-release -->
Modified: subversion/site/staging/docs/release-notes/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1842501&r1=1842500&r2=1842501&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/index.html (original)
+++ subversion/site/staging/docs/release-notes/index.html Mon Oct 1 13:51:29
2018
@@ -18,6 +18,11 @@
<h1>Apache Subversion Releases</h1>
+<div class="notice">
+<p>New 6-month regular and 2-year LTS release schedule: see
+<a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+</div>
+
<p>The Apache Subversion project publishes releases with a relatively high
degree of regularity. At any given time, we're working towards our
next major release while continuing to fix bugs in previous releases.
Modified: subversion/site/staging/download.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/download.html?rev=1842501&r1=1842500&r2=1842501&view=diff
==============================================================================
--- subversion/site/staging/download.html (original)
+++ subversion/site/staging/download.html Mon Oct 1 13:51:29 2018
@@ -20,6 +20,11 @@
[define version]1.10.2[end]
[define supported]1.9.9[end]
+<div class="notice">
+<p>New 6-month regular and 2-year LTS release schedule: see
+<a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
+</div>
+
<div class="bigpoint">
<p>The best available version of Apache Subversion
is: <a href="#recommended-release">[version]</a></p>
Propchange: subversion/site/staging/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 13:51:29 2018
@@ -1,2 +1,2 @@
-/subversion/site/publish/index.html:1812681-1837959
+/subversion/site/publish/index.html:1812681-1842500
/subversion/site/staging/index.html:1812681-1812682
Propchange: subversion/site/staging/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 13:51:29 2018
@@ -1,2 +1,2 @@
-/subversion/site/publish/news.html:1812681-1837959
+/subversion/site/publish/news.html:1812681-1842500
/subversion/site/staging/news.html:1812681-1812682
Modified: subversion/site/staging/roadmap.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/roadmap.html?rev=1842501&r1=1842500&r2=1842501&view=diff
==============================================================================
--- subversion/site/staging/roadmap.html (original)
+++ subversion/site/staging/roadmap.html Mon Oct 1 13:51:29 2018
@@ -19,7 +19,8 @@
<h1>Apache Subversion Roadmap</h1>
<div class="notice">
-<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>
+<p>New 6-month regular and 2-year LTS release schedule: see
+<a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
</div>
<div class="h2" id="upcoming-releases">
@@ -50,12 +51,7 @@
</thead>
<tbody>
<tr>
- <td>2018-09-xx</td>
- <td>Release 1.11.0-rc1</td>
- <td></td>
- </tr>
- <tr>
- <td>2018-09-xx</td>
+ <td>2018-10-xx</td>
<td>Release 1.11.0-rc2</td>
<td></td>
</tr>
@@ -107,16 +103,18 @@
LTS releases are intended to provide stability over longer periods.
</p>
-<table>
+<table cellpadding="0" cellspacing="0" class="centered">
<tr>
- <th>type of release</td>
+ <th>type of release</th>
<th>emphasis</th>
- <th>support period</td>
- <th>release numbers</td>
+ <th>release every</th>
+ <th>support period</th>
+ <th>release numbers</th>
</tr>
<tr>
<td>LTS release</td>
<td>stability</td>
+ <td>2 years</td>
<td>4 years</td>
<td>1.10, 1.14, ...</td>
</tr>
@@ -124,6 +122,7 @@
<td>regular release</td>
<td>features</td>
<td>6 months</td>
+ <td>6 months</td>
<td>1.11, 1.12, 1.13, ...</td>
</tr>
</table>
@@ -152,6 +151,12 @@ numbering, compatibility, and deprecatio
<h3>Transition to LTS and Regular Releases</h3>
+<p>Summary:
+<ul><li>1.9 and 1.10 are treated as LTS releases</li>
+ <li>1.11 and later follow the time-based release schedule</li>
+ <li>the next LTS release after 1.10 will be 1.14 LTS</li>
+</ul></p>
+
<p>Subversion 1.0 through 1.10 were released at intervals varying from around
6 months in early versions to 2.5 years more recently. Each of those releases
was supported with general backports until the next release and with high
priority fixes until the next release after that.</p>
<p>We are introducing faster regular releases in order to get new features
Propchange: subversion/site/staging/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 13:51:29 2018
@@ -1,2 +1,2 @@
-/subversion/site/publish/roadmap.html:1812681-1841746
+/subversion/site/publish/roadmap.html:1812681-1842500
/subversion/site/staging/roadmap.html:1812681-1812682
