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

[st...@apache.org]

Author: stsp
Date: Thu Mar 21 21:23:58 2013
New Revision: 1459532

URL: http://svn.apache.org/r1459532
Log:
* sites/publish/release-notes/1.8.html
  (moves): Since 'update' and 'switch' invoke the resolver, list them
   alongside 'svn resolve' as commands which can auto-resolve tree
   conflicts involving local moves.

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=1459532&r1=1459531&r2=1459532&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:23:58 2013
@@ -582,10 +582,10 @@ specially. Behavioural changes include:
   <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> cannot be automatically resolved yet).
+  <li><tt>svn update</tt>, <tt>svn switch</tt>, and <tt>svn resolve</tt>
+  can now automatically resolve tree conflicts involving locally moved
+  files or directories, (tree conflicts flagged by <tt>svn merge</tt>
+  cannot be automatically resolved 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