You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ha...@apache.org on 2020/04/17 16:32:49 UTC
svn commit: r1876671 - /subversion/site/publish/docs/release-notes/1.14.html
Author: hartmannathan
Date: Fri Apr 17 16:32:49 2020
New Revision: 1876671
URL: http://svn.apache.org/viewvc?rev=1876671&view=rev
Log:
1.14 release notes: Improve shelving transition notes.
* docs/release-notes/1.14.html
(#shelving-v2,
#shelving-v3): Document where the shelves are stored.
(#shelving-transition): Document where 1.10 shelves are stored in the same
sentence where we ask the user to find the patch files for them. Also
document how to access 1.11 and 1.12-1.13 shelves for consistency with
this section's heading.
Modified:
subversion/site/publish/docs/release-notes/1.14.html
Modified: subversion/site/publish/docs/release-notes/1.14.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.14.html?rev=1876671&r1=1876670&r2=1876671&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.14.html (original)
+++ subversion/site/publish/docs/release-notes/1.14.html Fri Apr 17 16:32:49 2020
@@ -1088,6 +1088,9 @@ the following kinds which it does not su
<li>creating and deleting directories</li>
</ul>
+<p>In Subversion 1.14, shelves created by Shelving-v2 are stored under
+<tt><i><WC></i>/.svn/experimental/shelves/v2</tt>.</p>
+
</div> <!-- shelving-v2 -->
<div class="h4 experimental-feature" id="shelving-v3">
@@ -1106,6 +1109,9 @@ under the hood to eventually support bet
and the possibility of future client-side features for manipulating and
sharing committable changes.</p>
+<p>In Subversion 1.14, shelves created by Shelving-v3 are stored under
+<tt><i><WC></i>/.svn/experimental/shelves/v3</tt>.</p>
+
</div> <!-- shelving-v3 -->
<div class="h4 experimental-feature" id="shelving-transition">
@@ -1114,25 +1120,26 @@ sharing committable changes.</p>
title="Link to this section">¶</a>
</h4>
-<p>The presence in the working copy of any shelves that were created by
-Subversion 1.10 has no effect on a Subversion 1.14 client. Subversion 1.14
-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>In Subversion 1.14, shelves are 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>The presence in the working copy of any shelves created by Subversion 1.10
+has no effect on a Subversion 1.14 client. Subversion 1.14 will ignore them;
+it cannot interoperate with them nor even list their presence.</p>
+
+<p>The <tt>svn upgrade</tt> command has no effect on shelves, as the
+working copy format is formally unchanged.</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>
+ <li>as 1.10 shelves are stored as patch files under
+ <tt><i><WC></i>/.svn/shelves/</tt>, find the patch file and
+ use any 1.10–1.14 or later <tt>svn patch</tt> to apply it.</li>
</ul></p>
+<p>To access shelves created by 1.11, first select Shelving-v2 by setting the
+environment variable <tt>SVN_EXPERIMENTAL_COMMANDS=shelf2</tt>.</p>
+
+<p>To access shelves created by 1.12–1.13, first select Shelving-v3 by
+setting the environment variable <tt>SVN_EXPERIMENTAL_COMMANDS=shelf3</tt>.</p>
+
</div> <!-- shelving-transition -->
<div class="h4 experimental-feature" id="shelving-checkpointing">