You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ha...@apache.org on 2020/02/19 20:36:34 UTC
svn commit: r1874216 - /subversion/site/publish/docs/release-notes/1.14.html
Author: hartmannathan
Date: Wed Feb 19 20:36:33 2020
New Revision: 1874216
URL: http://svn.apache.org/viewvc?rev=1874216&view=rev
Log:
1.14 release notes: Relative to 1.10, describe nonexperimental changes in 1.12
* docs/release-notes/1.14.html
(conflict-resolver): Add text from 1.12 release notes to text previously
copied from 1.11 release notes, with minor editing for proper flow.
(authz-groups,
plaintext-passwords-disabled,
repos-wc-copy,
svn-list,
svn-info,
svn-cleanup): New subsections, copied from 1.12 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=1874216&r1=1874215&r2=1874216&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.14.html (original)
+++ subversion/site/publish/docs/release-notes/1.14.html Wed Feb 19 20:36:33 2020
@@ -216,12 +216,13 @@ in a range of revisions.</p>
title="Link to this section">¶</a>
</h4>
-<p>This change was first introduced in 1.11.</p>
+<p>Since its introduction in 1.10, the new interactive conflict resolver has
+received various improvements.</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>Starting in 1.11, the interactive conflict resolver 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
@@ -231,6 +232,79 @@ on that branch as well. For details, see
"Unresolvable tree conflict when cherrypicking a file-edit after file was
moved on source branch".</p>
+<p>Furthermore, since 1.12, the interactive conflict resolver supports some
+cases where items were moved to disparate locations. Support for unversioned
+items in the working copy has been improved as well. The table below lists
+these cases and available resolution options for each.</p>
+
+<table border="1">
+ <tr>
+ <th>local change</th>
+ <th>incoming change</th>
+ <th>operation</th>
+ <th>resolution options</th>
+ </tr>
+ <tr>
+ <td><ul>
+ <li>move file</li>
+ </ul></td>
+ <td><ul>
+ <li>move file</li>
+ </ul></td>
+ <td>update, merge</td>
+ <td><ul>
+ <li>merge<br>(applies textual changes only and leaves the tree structure
+ of the working copy as it is)
+ <li>move and merge<br>(changes the file's location in the working copy
+ to match that of the merge source before merging changes)
+ </ul></td>
+ </tr>
+ <tr>
+ <td><ul>
+ <li>move directory</li>
+ </ul></td>
+ <td><ul>
+ <li>move directory</li>
+ </ul></td>
+ <td>merge</td>
+ <td><ul>
+ <li>merge<br>(applies changes to the corresponding directory and leaves
+ the tree structure of the working copy as it is)
+ <li>move and merge<br>(changes the directory's location in the working
+ copy to match that of the merge source before merging changes)
+ </ul></td>
+ <tr>
+ <td><ul>
+ <li>unversioned file</li>
+ </ul></td>
+ <td><ul>
+ <li>add file</li>
+ </ul></td>
+ <td>update, switch </td>
+ <td><ul>
+ <li>merge<br>(merges the unversioned file with the incoming file)
+ </ul></td>
+ </tr>
+ <tr>
+ <td><ul>
+ <li>unversioned directory</li>
+ </ul></td>
+ <td><ul>
+ <li>add directory</li>
+ </ul></td>
+ <td>update, switch </td>
+ <td><ul>
+ <li>merge<br>(re-adds directory to working copy but leaves any on-disk
+ files as they were)
+ </ul></td>
+ </tr>
+</table>
+
+<p>During <tt>svn update</tt>, the deletion of a directory which contains
+unversioned items but is otherwise unmodified no longer causes a tree
+conflict. This avoids tree conflicts caused by software build artifacts
+in the working copy, for example.</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>
@@ -240,11 +314,16 @@ moved on source branch".</p>
<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>
+<li>A case where text conflicts were created with the incoming changes
+theirs) and local changes (mine) swapped within text conflict markers. This
+caused unexpected results when the <tt>svn resolve</tt> command was used with
+the <tt>--accept theirs</tt> or <tt>--accept mine</tt> options. This is fixed
+as of 1.12.</li>
</ul>
</p>
<p>Fixes for conflict resolver bugs found during the development of
-Subversion 1.11 have been backported to the
+Subversion 1.11 and 1.12 have been backported to the
<a href="1.10.html">Subversion 1.10</a> release series as well.</p>
</div> <!-- conflict-resolver -->
@@ -296,6 +375,19 @@ Subversion 1.11 have been backported to
</div> <!-- issue-4767 -->
+<div class="h4" id="authz-groups">
+<h4>Empty group definitions in authz rules
+ <a class="sectionlink" href="#authz-groups"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>Subversion servers will now ignore empty group definitions in their
+path-based authorization rules. The <tt>svnauthz</tt> command will print
+a warning if it detects empty group definitions.</p>
+</div> <!-- authz-groups -->
+
</div> <!-- server-side-improvements -->
<div class="h3" id="client-server-improvements">
@@ -304,6 +396,79 @@ Subversion 1.11 have been backported to
title="Link to this section">¶</a>
</h3>
+<div class="h4" id="plaintext-passwords-disabled">
+<h4>Plaintext passwords on disk disabled by default
+ <a class="sectionlink" href="#plaintext-passwords-disabled"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>On Unix-like systems, client-side storage of passwords in plaintext on
+disk is now disabled by default <em>at compile-time</em>.
+Password caching mechanisms based on Gnome Keyring, Kwallet, or GPG-Agent,
+are recommended instead.</p>
+
+<p>This change does not affect Windows or Mac OS platforms, where passwords
+have always been stored in an encrypted representation.</p>
+</div> <!-- plaintext-passwords-disabled -->
+
+<div class="h4" id="repos-wc-copy">
+<h4>Improved copying from repository source to working copy target
+ <a class="sectionlink" href="#repos-wc-copy"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+
+<p>Behaviour of copy operations with a repository source and a working copy
+target has been improved:</p>
+
+<ul>
+<li>Existing parent directories are now handled correctly.</li>
+<li>Peg and operative revisions are now handled correctly (see
+<a href="https://issues.apache.org/jira/browse/SVN-4785">issue #4785</a>
+for details).</li>
+</ul>
+</div> <!-- repos-wc-copy -->
+
+<div class="h4" id="svn-list">
+<h4><tt>svn list</tt> improvements
+ <a class="sectionlink" href="#svn-list"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn list</tt> command now avoids truncation of long author names
+by dynamically adjusting the width of columns displayed.</p>
+<p>The <tt>svn list</tt> command now supports a <tt>--human-readable</tt>
+(<tt>-H</tt>) option which will display sizes in human-readable units
+(Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes and Petabytes).</p>
+</div> <!-- svn-list -->
+
+<div class="h4" id="svn-info">
+<h4><tt>svn info</tt> improvements
+ <a class="sectionlink" href="#svn-info"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn info</tt> command can now display the size of files in the
+repository. The file size is only displayed if the target of <tt>svn info</tt>
+is a file URL.</p>
+</div> <!-- svn-info -->
+
+<div class="h4" id="svn-cleanup">
+<h4><tt>svn cleanup</tt> improvements
+ <a class="sectionlink" href="#svn-cleanup"
+ title="Link to this section">¶</a>
+</h4>
+
+<p>This change was first introduced in 1.12.</p>
+<p>The <tt>svn cleanup</tt> command, when asked to remove unversioned or
+ignored items, will now remove directories even if they are write-protected.</p>
+</div> <!-- svn-cleanup -->
+
</div> <!-- client-server-improvements -->
<div class="h3" id="apis">