Author: stsp
Date: Sat Apr 13 12:48:01 2013
New Revision: 1467612
URL: http://svn.apache.org/r1467612
Log:
* site/publish/docs/release-notes/1.8.html
(moves): Tidy this section a bit. Link to a known issue, and remove excessive
example output that is hard to parse for casual readers skimming this page.
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=1467612&r1=1467611&r2=1467612&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Sat Apr 13 12:48:01 2013
@@ -644,48 +644,29 @@ $
</pre>
<p>Some Subversion operations will now treat moved files and directories
-specially. Behavioural changes include:
+specially. Behavioural changes include:</p>
<ul>
- <li><tt>svn move</tt> now refuses to move a
+ <li><p><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
+ >mixed-revision working copy</a>.</p></li>
+ <li><p><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 update</tt>, <tt>svn switch</tt>, and <tt>svn resolve</tt>
+ 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, (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
+ cannot be automatically resolved yet).</p>
+ <p>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'
- > 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>
-
+ instead of updating it, in which case the move becomes a copy which
+ is no longer linked to a deletion.</p></li>
+ <li><p>Known issue: Tree conflicts involving replacements are currently
+ not detected when updating a move (see
+ <a href="http://subversion.tigris.org/issues/show_bug.cgi?id=4318";
+ >issue #4318</a>).</p></li>
</ul>
+
</p>
</div> <!-- moves -->
