You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/03/21 22:25:43 UTC
svn commit: r1459535 - /subversion/site/publish/docs/release-notes/1.8.html
Author: stsp
Date: Thu Mar 21 21:25:43 2013
New Revision: 1459535
URL: http://svn.apache.org/r1459535
Log:
* site/publish/release-notes/1.8.html (moves): Indentation fix.
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=1459535&r1=1459534&r2=1459535&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:25:43 2013
@@ -583,13 +583,13 @@ 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.</li>
<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
- instead of updating it, in which case the move becomes a copy.</li>
+ 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
+ instead of updating it, in which case the move becomes a copy.</li>
<pre>$ svn update
Updating '.':
C epsilon/zeta