Author: hartmannathan
Date: Wed Feb 19 18:34:17 2020
New Revision: 1874205
URL: http://svn.apache.org/viewvc?rev=1874205&view=rev
Log:
1.14 release notes: Relative to 1.10, describe nonexperimental changes in 1.11
* docs/release-notes/1.14.html
(news): Explain that these 1.14-LTS release notes are written relative to
the preceding LTS release, 1.10.
(conflict-resolver,
info-show-item,
save-client-cert-pw,
issue-4767,
javahl,
ruby-swig-issue-602): New subsections, copied from 1.11 release notes.
Modified:
subversion/site/publish/docs/release-notes/1.14.html
Modified: subversion/site/publish/docs/release-notes/1.14.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.14.html?rev=1874205&r1=1874204&r2=1874205&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.14.html (original)
+++ subversion/site/publish/docs/release-notes/1.14.html Wed Feb 19 18:34:17
2020
@@ -66,6 +66,10 @@ releases, and is as of the time of its r
in 1.14, but 1.14 contains features and bugfixes not present in any
earlier release.</p>
+<p>Because 1.14 is the next LTS release following 1.10, these release
+notes describe major changes since 1.10, including changes released in
+1.11.x through 1.13.x.</p>
+
<p>This page describes only major changes. For a complete list of
changes, see the 1.14 section of the <a
href="https://svn.apache.org/repos/asf/subversion/trunk/CHANGES"; >CHANGES</a>
@@ -204,7 +208,70 @@ users. We'll cover those in this sectio
mutually exclusive. This makes it easier to display only the differences
in a range of revisions.</p>
-</div> <!-- log-search -->
+</div> <!-- log-quiet-diff -->
+
+<div class="h4" id="conflict-resolver">
+<h4>Improvements to the interactive conflict resolver
+ <a class="sectionlink" href="#conflict-resolver"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<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".</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 -->
+
+<div class="h4" id="info-show-item">
+<h4>Additions to <tt>svn info --show-item</tt>
+ <a class="sectionlink" href="#info-show-item"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>Add '<tt>schedule</tt>' and '<tt>depth</tt>' items to '<tt>svn info
--show-item</tt>' (<a href="http://svn.apache.org/r1827032";>r1827032</a>).</p>
+
+</div> <!-- info-show-item -->
+
+<div class="h4" id="save-client-cert-pw">
+<h4>Allow the client cert password to be saved
+ <a class="sectionlink" href="#save-client-cert-pw"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>Allow the client cert password to be saved (<a
href="http://svn.apache.org/r1836762";>r1836762</a>).</p>
+
+</div> <!-- save-client-cert-pw -->
</div> <!-- cmdline -->
@@ -214,6 +281,21 @@ in a range of revisions.</p>
title="Link to this section">¶</a>
</h3>
+<div class="h4" id="issue-4767">
+<h4><tt>svnadmin dump</tt> shouldn't canonicalize <tt>svn:date</tt>
+ (<a href="https://issues.apache.org/jira/browse/SVN-4767";>issue #4767</a>)
+ <a class="sectionlink" href="#issue-4767"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p><tt>svnadmin dump</tt> no longer attempts to canonicalize the
+ <tt>svn:date</tt> revision property value in its output. The dump output
+ will now contain the value exactly as it exists in the repository.</p>
+
+</div> <!-- issue-4767 -->
+
</div> <!-- server-side-improvements -->
<div class="h3" id="client-server-improvements">
@@ -372,6 +454,19 @@ of Subversion's dependencies, see the
</div> <!-- py3c -->
+<div class="h4" id="javahl">
+<h4>JavaHL Updates
+ <a class="sectionlink" href="#javahl"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p>The JavaHL bindings have been updated to be compatible with Java 10. Due
+ to required build changes, JavaHL now requires at least Java 8 to
compile.</p>
+
+</div> <!-- javahl -->
+
</div> <!-- apis -->
</div> <!-- enhancements -->
@@ -406,6 +501,31 @@ Python, categorized by their Python 3 su
</div> <!-- python3-work-in-progress -->
+<div class="h3" id="ruby-swig-issue-602">
+<h3>Ruby bindings require swig 3.0.9
+ <a class="sectionlink" href="#ruby-swig-issue-602"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>This change was first introduced in 1.11.</p>
+
+<p><em>This section only affects those who build Subversion from a working
+ copy. If you build Subversion from a tarball or zip file, you may skip
+ this section.</em></p>
+
+<p>The Ruby bindings are known not to build with swig version 3.0.8 (and only
+that version) due to <a href="https://github.com/swig/swig/issues/602";>swig
+issue #602</a>. We recommend to use swig 3.0.9 or newer.</p>
+
+<p>The failure is detected by the test suite.
+To test whether your version of swig is affected, run
+<tt>make check-swig-rb</tt>. (Some distros might have backported the swig
+patch into their swig-3.0.8 packages.)</p>
+
+<p>The Perl and Python bindings are not affected.</p>
+
+</div> <!-- ruby-swig-issue-602 -->
+
</div> <!-- issues -->
<!-- (This section only makes sense when there are some issues listed in it.)
