svn commit: r1058375 - /subversion/site/publish/docs/release-notes/1.7.html

[st...@apache.org]

Author: stsp
Date: Thu Jan 13 00:35:31 2011
New Revision: 1058375

URL: http://svn.apache.org/viewvc?rev=1058375&view=rev
Log:
* publish/docs/release-notes/1.7.html
  (enhancements): Mention that merges into mixed-rev WCs are now disallowed
   by default.

Modified:
    subversion/site/publish/docs/release-notes/1.7.html

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1058375&r1=1058374&r2=1058375&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Thu Jan 13 00:35:31 2011
@@ -619,6 +619,31 @@ script given in
 
 </div>  <!-- atomic-revprops -->
 
+<div class="h3" id="merge-mixed-rev-wc">
+<h3>Merges into mixed-revision working copies now disallowed by default
+  <a class="sectionlink" href="#merge-mixed-rev-wc"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>To prevent unnecessary conflicts, <code>svn merge</code> will now fail
+with an error if the merge target is 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>.</p>
+
+<p>A mixed-revision working copy will need to be updated with
+<code>svn update</code> before a merge can be performed into it.
+This restriction has always existed during merges using the
+<strong><tt>--reintegrate</tt></strong> option and it is now the default
+behaviour for every type of merge.</p>
+
+<p>For backwards-compatibility, there is a new option called
+<strong><tt>--allow-mixed-revisions</tt></strong> which disables the
+check for a mixed-revision working copy, except for reintegrate merges.
+Using this option is <strong>not</strong> recommended.
+Please use <code>svn update</code> instead.</p>
+
+</div>  <!-- merge-mixed-rev-wc -->
+
 </div>  <!-- enhancements -->
 
 <div class="h2" id="svn-1.5-deprecation">