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

[st...@apache.org]

Author: stsp
Date: Tue Sep 25 14:37:56 2012
New Revision: 1389887

URL: http://svn.apache.org/viewvc?rev=1389887&view=rev
Log:
* publish/docs/release-notes/1.8.html: The new automatic merge feature seems
   to be happy with local modifications in the working copy.
   Change a statement I added which was claiming the contrary.

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=1389887&r1=1389886&r2=1389887&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Tue Sep 25 14:37:56 2012
@@ -393,10 +393,9 @@ in its top-level directory:</p>
 
 <pre>$ svn merge ^/branches/my-branch</pre>
 
-<p>This merge will still perform the same sanity checks which
+<p>This merge will still perform similar sanity checks which
 <tt>svn merge --reintegrate</tt> performed in earlier releases:
 <ul>
-<li>The working copy must not have any local modifications.</li>
 <li>The working copy must not be a <a
 href="http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.basic.in-action.mixedrevs"
 >mixed-revision working copy</a>.</li>
@@ -410,7 +409,9 @@ reintegrated).</li>
 
 <p>If any of these conditions are detected, the merge is aborted and
 the necessary steps must be taken to fix the problem before the
-branch can be reintegrated.</p>
+branch can be reintegrated.
+In contrast to a <tt>--reintegrate</tt> merge, an automatic merge
+into a working copy with local modifications is allowed.</p>
 
 <p>Merging to-and-fro between two branches in any order is possible
 using the automatic merge (the &quot;<a