svn commit: r1459528 - /subversion/site/publish/docs/release-notes/1.8.html

[st...@apache.org]

Author: stsp
Date: Thu Mar 21 21:15:59 2013
New Revision: 1459528

URL: http://svn.apache.org/r1459528
Log:
* site/publisch/docs/release-notes/1.8.html
  (moves): Extend description of the new "local move tracking" feature.

Modified:
    subversion/site/publish/docs/release-notes/1.8.html

Modified: subversion/site/publish/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.8.html?rev=1459528&r1=1459527&r2=1459528&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Thu Mar 21 21:15:59 2013
@@ -559,19 +559,62 @@ before applying them.  See <tt>svnauthz 
     title="Link to this section">&para;</a>
 </h3>
 
-<p>The effect of the <code>svn move</code> command is now different
-from running <code>svn copy</code> followed by <code>svn delete</code>.
+<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.
-These links are shown by <code>svn status</code> and <code>svn info</code>.</p>
+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 specially. Behavioural changes include:
+<pre>$ svn move epsilon/zeta zeta-moved
+$ svn status
+D       epsilon/zeta
+        &gt; moved to zeta-moved
+A  +    zeta-moved
+        &gt; moved from epsilon/zeta
+$ 
+</pre>
+
+<p>Some Subversion operations will now treat moved files and directories
+specially. Behavioural changes include:
 <ul>
-  <li>Moves can only be comitted if both sides of the move are part of
-      the commit.</li>
-  <li>Some classes of tree conflicts involving moves are automatically
-      resolved. For instance, incoming file edits during an update will
-      automatically be applied to moved files at their new location.</li>
+  <li><tt>svn move</tt> now refuses to move a
+  <a href="http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs"
+ >mixed-revision working copy</a>.</li>
+  <li><tt>svn commit</tt> will only commit a moved file or directory
+    if both sides of the move are part of the same commit. This ensures
+    that moves are an atomic operation upon future updates and merges.</li>
+  <li><tt>svn resolve</tt> can now automatically resolve tree conflicts
+   involving locally moved files or directories, if the conflict was
+   flagged by <tt>svn update</tt> or <tt>svn switch</tt> (tree conflicts
+   flagged by <tt>svn merge</tt> are not supported yet).
+   The update or switch operation can be applied to the new location of
+   the moved file or directory, which resolves the tree conflict and
+   allows the move to be committed. It is also possible to break a move
+   instead of updating it, in which case the move becomes a copy.</li>
+<pre>$ svn update
+Updating '.':
+   C epsilon/zeta
+At revision 3.
+Summary of conflicts:
+  Tree conflicts: 1
+Tree conflict on 'epsilon/zeta'
+   &gt; local file moved away, incoming file edit upon update
+Select: (p) postpone, (mc) mine-conflict, (r) resolved, (q) quit,
+        (h) help: h
+
+  (p)  postpone         - resolve the conflict later
+  (mc) mine-conflict    - apply update to the move destination
+  (r)  resolved         - mark resolved (the move will become a copy)
+  (q)  quit             - postpone all remaining conflicts
+  (h)  help             - show this help (also '?')
+
+Select: (p) postpone, (mc) mine-conflict, (r) resolved, (q) quit,
+        (h) help: mc
+U    zeta-moved
+Updated to revision 3.
+Resolved conflicted state of 'epsilon/zeta'
+$ 
+</pre>
+
 </ul>
 </p>