[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

1.8 release notes - Working copy records moves as first-class operation

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 20 Jun 2013 16:30:33 +0100 (BST)

I just noticed the "Working copy records moves as first-class operation" section in the release notes may not be clear enough, as it doesn't explicitly point out that the local move is NOT preserved as a move when committed.  I feel some readers will optimistically assume it means more than it does, and then be disappointed.  (Remember that some users have a much fuzzier notion of terms such as "working copy" than we do.)

Suggested patch:

[[[
Index: publish/docs/release-notes/1.8.html
===================================================================
--- publish/docs/release-notes/1.8.html    (revision 1494993)
+++ publish/docs/release-notes/1.8.html    (working copy)
@@ -305,13 +305,13 @@
 </div>
 
 <div class="h4" id="svn-status-info-moves">
-<h4><tt>svn status</tt> and <tt>svn info</tt> now show moves
+<h4><tt>svn status</tt> and <tt>svn info</tt> now show local moves
   <a class="sectionlink" href="#svn-status-info-moves"
     title="Link to this section">&para;</a>
 </h4>
 
 <p><tt>svn status</tt> now shows moves in its output.
-See the section about moves for more information.</p>
+See the section about local moves for more information.</p>
 
 <p><tt>svn status</tt> shows an extra line for each item involved in a move:</p>
 <pre>$ svn move epsilon/zeta zeta-moved
@@ -323,7 +323,7 @@
 $
 </pre>
 
-<p><tt> svn info</tt> shows extra lines for moved items, too.
+<p><tt> svn info</tt> shows extra lines for locally moved items, too.
 For example, if the file <tt>beta</tt> was moved to <tt>beta-new</tt>,
 <tt>svn info beta</tt> will show the following (some unrelated output
 has been omitted in this example):</p>
@@ -784,10 +784,11 @@
 
 <p>The effect of the <tt>svn move</tt> command is now different
 from running <tt>svn copy</tt> followed by <tt>svn delete</tt>.
-Moves are represented as a copy and a delete which are linked to one another.
+Moves are represented within the working copy as a copy and a delete which
+are linked to one another.
 These links are shown by <tt>svn status</tt> and <tt>svn info</tt>.</p>
 
-<p>Some Subversion operations will now treat moved files and directories
+<p>Some Subversion operations will now treat locally moved files and directories
 specially. Behavioural changes include:</p>
 <ul>
   <li><p><tt>svn move</tt> now refuses to move a
@@ -806,10 +807,17 @@
     is no longer linked to a deletion.</p></li>
 </ul>
 
+<p>What this <em>does not</em> mean:</p>
+<ul>
+  <li><p>Moves are recorded as such only within the working copy. The link
+    between the copy and the delete is established only when a local move
+    operation is performed, and is lost upon commit.</p></li>
+</ul>
+
 <p>Known issues are:</p>
 <ul>
   <li><p>Tree conflicts involving replacements are currently
-    not detected when updating a move (see <a
+    not detected when updating a moved file or directory (see <a
     href="http://subversion.tigris.org/issues/show_bug.cgi?id=4318"
     >issue #4318</a>).</p></li>
   <li><p>Tree conflicts flagged by <tt>svn merge</tt> cannot be automatically
]]]

Good to commit?

- Julian

 

--
Join WANdisco's free daily demo sessions on Scaling Subversion for the Enterprise
<http://www.wandisco.com/training/webinars>
Received on 2013-06-20 17:32:50 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.