subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1842513 - in /subversion/site/publish: ./ docs/release-notes/1.11.html index.html news.html roadmap.html
Date Mon, 01 Oct 2018 15:46:50 GMT
Author: stsp
Date: Mon Oct  1 15:46:49 2018
New Revision: 1842513

Website: sync merge from 'staging' to 'publish'.

    subversion/site/publish/   (props changed)
    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 @@

Modified: subversion/site/publish/docs/release-notes/1.11.html
--- 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">&para;</a>
-<p>See in particular
-<a href="">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="">issue #4694</a>,
 "Unresolvable tree conflict when cherrypicking a file-edit after file was
-moved on source branch" and
-<a href="">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:
+<li><a href="">Issue #4744</a>
+&quot;assertion failed (start_rev &gt; end_rev)&quot;</li>
+<li><a href="">Issue #4766</a>
+&quot;resolver adds unrelated moves to move target list&quot;</li>
+<li>A problem where the resolver mistakenly
+<a href="">searched back through
+the entire history of the repository</a></li>
+<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 @@

Propchange: subversion/site/publish/news.html
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct  1 15:46:49 2018
@@ -1 +1 @@

Propchange: subversion/site/publish/roadmap.html
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct  1 15:46:49 2018
@@ -1 +1 @@

View raw message