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 2019/04/12 07:52:47 UTC
svn commit: r1857373 - in /subversion/site/publish: ./
docs/release-notes/1.12.html
Author: stsp
Date: Fri Apr 12 07:52:46 2019
New Revision: 1857373
URL: http://svn.apache.org/viewvc?rev=1857373&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 07:52:46 2019
@@ -1 +1 @@
-/subversion/site/staging:1812683-1854852
+/subversion/site/staging:1812683-1857372
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=1857373&r1=1857372&r2=1857373&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.12.html (original)
+++ subversion/site/publish/docs/release-notes/1.12.html Fri Apr 12 07:52:46 2019
@@ -257,14 +257,55 @@ handle more kinds of changes more robust
title="Link to this section">¶</a>
</h4>
-<p>The interactive conflict resolver now supports more conflict situations.
+<p>The interactive conflict resolver now supports some cases where items
+were moved to disparate locations.
+The table below lists the newly supported 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>
+</table>
<p>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> release series as well.</p>
+<a href="1.10.html">Subversion 1.10</a> and
+<a href="1.11.html">Subversion 1.11</a> release series as well.</p>
</div> <!-- conflict-resolver -->