subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1842512 - /subversion/site/staging/docs/release-notes/1.11.html
Date Mon, 01 Oct 2018 15:45:24 GMT
Author: stsp
Date: Mon Oct  1 15:45:24 2018
New Revision: 1842512

URL: http://svn.apache.org/viewvc?rev=1842512&view=rev
Log:
* staging/docs/release-notes/1.11.html: Conflict resolver improvements.

Modified:
    subversion/site/staging/docs/release-notes/1.11.html

Modified: subversion/site/staging/docs/release-notes/1.11.html
URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1842512&r1=1842511&r2=1842512&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Mon Oct  1 15:45:24 2018
@@ -404,12 +404,34 @@ properties, except the following kinds w
      title="Link to this section">&para;</a>
 </h4>
 
-<p>See in particular
-<a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>
+<p>The interactive conflict resolver now supports more conflict situations
+which involve moved files and directories. Specifically, many tree conflicts
+which report a "locally missing" item, as a result of an item having moved
+on the merge source branch, can now be resolved automatically.</p>
+
+<p>For example, when a file edit is cherry-picked from a branch on which
+the edited file has been renamed, the edit will now be applied to the file's
+location in the merge target branch, provided it has not been renamed
+on that branch as well. For details, see
+<a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>,
 "Unresolvable tree conflict when cherrypicking a file-edit after file was
-moved on source branch" and
-<a href="https://issues.apache.org/jira/browse/SVN-4766">issue #4766</a>
-"resolver adds unrelated moves to move target list".</p>
+moved on source branch".</p>
+
+<p>Several bugs have been fixed in the conflict resolver, including:
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4744">Issue #4744</a>
+&quot;assertion failed (start_rev &gt; end_rev)&quot;</li>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4766">Issue #4766</a>
+&quot;resolver adds unrelated moves to move target list&quot;</li>
+<li>A problem where the resolver mistakenly
+<a href="https://svn.apache.org/r1839662">searched back through
+the entire history of the repository</a></li>
+</ul>
+</p>
+
+<p>Fixes for conflict resolver bugs found during the development of
+Subversion 1.11 have been backported to the
+<a href="1.10.html">Subversion 1.10</a> release series as well.</p>
 
 </div> <!-- conflict-resolver -->
 



Mime
View raw message