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

[ju...@apache.org]

Author: julianfoad
Date: Thu Jun 20 20:54:44 2013
New Revision: 1495180

URL: http://svn.apache.org/r1495180
Log:
* publish/docs/release-notes/1.8.html
  (svn-merge-check-related): New section within the "Command-line client
    improvements (client)" section.

Suggested by: jcorvel

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=1495180&r1=1495179&r2=1495180&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Thu Jun 20 20:54:44 2013
@@ -1871,6 +1871,28 @@ author <tt>james</tt> in September 2012:
 
 </div>  <!-- svn-log-search -->
 
+<div class="h4" id="svn-merge-check-related">
+<h4>'svn merge' will refuse to merge from an unrelated branch
+  <a class="sectionlink" href="#svn-merge-check-related"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>The <tt>svn merge</tt> command without a revision range
+now checks that the source branch is related to the target branch, and
+fails if not. Branches are 'related' if their histories, when traced
+back following copies, eventually arrive at the same node. One useful
+case is when an automatic merge is attempted from the wrong level of
+subdirectory in an otherwise related branch. Example:</p>
+<pre>$ svn merge ^/trunk branch-wc/subdir
+svn: E205000: Source and target must be different but related branches
+svn: E205000: Source and target have no common ancestor: 'https://.../trunk@head' and 'branch-wc/subdir@unspecified'
+</pre>
+
+<p>It is still possible to merge from an unrelated branch by specifying a
+revision range, even a catch-all range such as <tt>1:HEAD</tt>.</p>
+
+</div>  <!-- svn-merge-check-related -->
+
 </div>  <!-- cmdline -->
 
 <div class="h3" id="custom-keywords">