Author: stsp
Date: Fri Apr 12 08:56:50 2019
New Revision: 1857384
URL: http://svn.apache.org/viewvc?rev=1857384&view=rev
Log:
publish: merge from staging
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/1.12.html
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 12 08:56:50 2019
@@ -1 +1 @@
-/subversion/site/staging:1812683-1857377
+/subversion/site/staging:1812683-1857383
Modified: subversion/site/publish/docs/release-notes/1.12.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.12.html?rev=1857384&r1=1857383&r2=1857384&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.12.html (original)
+++ subversion/site/publish/docs/release-notes/1.12.html Fri Apr 12 08:56:50
2019
@@ -258,10 +258,10 @@ handle more kinds of changes more robust
</h4>
<p>The interactive conflict resolver now supports some cases where items
-were moved to disparate locations.
+were moved to disparate locations. Support for unversioned items in the
+working copy has been improved as well.
The table below lists the newly supported cases and available resolution
-options for each.
-</p>
+options for each.</p>
<table border="1">
<tr>
@@ -299,11 +299,46 @@ options for each.
<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>Fixes for conflict resolver bugs found during the development of
-Subversion 1.12 have been backported to the
+<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 a case
+where text conflicts were created with the incoming changes (theirs) and
+local changes (mine) swapped within text conflict markers. Which caused
+unexpected results when the <tt>svn resolve</tt> command was used with
+the <tt>--accept theirs</tt> or <tt>--accept mine</tt> options.</p>
+
+<p>Support for unversioned items and fixes for conflict resolver bugs found
+during the development of Subversion 1.12 have been backported to the
<a href="1.10.html">Subversion 1.10</a> and
<a href="1.11.html">Subversion 1.11</a> release series as well.</p>
