subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1492163 - /subversion/site/publish/docs/release-notes/1.8.html
Date Wed, 12 Jun 2013 11:52:49 GMT
Author: stsp
Date: Wed Jun 12 11:52:49 2013
New Revision: 1492163

URL: http://svn.apache.org/r1492163
Log:
* docs/release-notes/1.8.html: Clarify how tree conflicts involving local moves
   can be resolved in 1.8.

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=1492163&r1=1492162&r2=1492163&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Wed Jun 12 11:52:49 2013
@@ -711,10 +711,10 @@ specially. Behavioural changes include:<
     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.</p></li>
   <li><p><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.
-    The update or switch operation can be applied to the new location of
-    the moved file or directory, which resolves the tree conflict and
+    can now resolve tree conflicts involving locally moved files or
+    directories. By picking the 'mine-conflict' option at the conflict
+    prompt, 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 which
     is no longer linked to a deletion.</p></li>



Mime
View raw message