Author: julianfoad
Date: Mon Sep 24 10:59:04 2018
New Revision: 1841828
URL: http://svn.apache.org/viewvc?rev=1841828&view=rev
Log:
* publish/docs/release-notes/1.11.html
(shelving-transition): New section.
Modified:
subversion/site/publish/docs/release-notes/1.11.html
Modified: subversion/site/publish/docs/release-notes/1.11.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1841828&r1=1841827&r2=1841828&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.11.html (original)
+++ subversion/site/publish/docs/release-notes/1.11.html Mon Sep 24 10:59:04
2018
@@ -117,7 +117,8 @@ 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>
@@ -160,6 +161,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"
@@ -285,7 +330,9 @@ 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>
@@ -325,26 +372,6 @@ properties, except the following kinds w
<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 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>
-
<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>
