You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/10/01 15:46:50 UTC
svn commit: r1842513 - in /subversion/site/publish: ./
docs/release-notes/1.11.html index.html news.html roadmap.html
Author: stsp
Date: Mon Oct 1 15:46:49 2018
New Revision: 1842513
URL: http://svn.apache.org/viewvc?rev=1842513&view=rev
Log:
Website: sync merge from 'staging' to 'publish'.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/1.11.html
subversion/site/publish/index.html (props changed)
subversion/site/publish/news.html (props changed)
subversion/site/publish/roadmap.html (props changed)
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 15:46:49 2018
@@ -1 +1 @@
-/subversion/site/staging:1812683-1841747
+/subversion/site/staging:1812683-1842512
Modified: subversion/site/publish/docs/release-notes/1.11.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842513&r1=1842512&r2=1842513&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.11.html (original)
+++ subversion/site/publish/docs/release-notes/1.11.html Mon Oct 1 15:46:49 2018
@@ -404,12 +404,34 @@ properties, except the following kinds w
title="Link to this section">¶</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>
+"assertion failed (start_rev > end_rev)"</li>
+<li><a href="https://issues.apache.org/jira/browse/SVN-4766">Issue #4766</a>
+"resolver adds unrelated moves to move target list"</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 -->
Propchange: subversion/site/publish/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 15:46:49 2018
@@ -1 +1 @@
-/subversion/site/staging/index.html:1812681-1841747
+/subversion/site/staging/index.html:1812681-1842512
Propchange: subversion/site/publish/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 15:46:49 2018
@@ -1 +1 @@
-/subversion/site/staging/news.html:1812681-1841747
+/subversion/site/staging/news.html:1812681-1842512
Propchange: subversion/site/publish/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 15:46:49 2018
@@ -1 +1 @@
-/subversion/site/staging/roadmap.html:1812681-1841747
+/subversion/site/staging/roadmap.html:1812681-1842512