Author: stsp
Date: Sat Apr 13 12:56:09 2013
New Revision: 1467615
URL: http://svn.apache.org/r1467615
Log:
* publish/docs/release-notes/1.8.html
(moves): Mention the known 'svn merge' limitation in a new section of
known issues, alongside issue #4318.
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=1467615&r1=1467614&r2=1467615&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:56:09 2013
@@ -654,8 +654,7 @@ specially. Behavioural changes include:<
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).</p>
+ files or directories.</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
@@ -663,10 +662,15 @@ specially. Behavioural changes include:<
is no longer linked to a deletion.</p></li>
</ul>
-<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>
+<p>Known issues are:</p>
+<ul>
+ <li><p>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>
+ <li><p>Tree conflicts flagged by <tt>svn merge</tt> cannot be automatically
+ resolved yet. This will be addressed in a future release.</p></li>
+</ul>
</div> <!-- moves -->
