subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1780207 - /subversion/site/publish/docs/release-notes/1.10.html
Date Wed, 25 Jan 2017 15:14:47 GMT
Author: stsp
Date: Wed Jan 25 15:14:46 2017
New Revision: 1780207

URL: http://svn.apache.org/viewvc?rev=1780207&view=rev
Log:
* release-notes/1.10.html
  (conflict-resolver): Simplify the table by removing the node kind
    column which has the same value in every row. Explain this in the
    surounding text instead. Also, move all text in this section above
    the table for better visibility.

Modified:
    subversion/site/publish/docs/release-notes/1.10.html

Modified: subversion/site/publish/docs/release-notes/1.10.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1780207&r1=1780206&r2=1780207&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Wed Jan 25 15:14:46 2017
@@ -211,9 +211,16 @@ users.  We'll cover those in this sectio
    to appear. The <tt>svn resolve</tt> command will keep iterating over such
conflicts
    until none are left, or until the user decides to quit the operation.</p>
 
+<p>At present, the conflict resolver can be used interactively or called
+   from Subversion's client API. There is no support for non-interactive
+   conflict resolution with the <tt>svn</tt> command yet.</p>
+
 <p>The new conflict resolver offers a variety of automated tree conflict resolution
    options which users can choose from. Not all kinds of tree conflicts can yet be
-   described and resolved. The options available in Subversion 1.10.0 are listed below.</p>
+   described and resolved. The options available in Subversion 1.10.0 are listed in
+   the table below. In this table, the items on the incoming and local side are either
+   both files or both directories. Most cases where files clash with directories are
+   not handled yet.</p>
 
 <p>Future releases of Subversion will continue to provide enhancements for the new
    conflict resolver. We expect to add coverage of additional conflict cases and add
@@ -224,7 +231,6 @@ users.  We'll cover those in this sectio
     <th>operation</th>
     <th>incoming change</th>
     <th>local change</th>
-    <th>kinds of versioned items</th>
     <th>resolution options</th>
   </tr>
   <tr>
@@ -237,10 +243,6 @@ users.  We'll cover those in this sectio
       <li>move an item</li>
     </ul></td>
     <td><ul>
-      <li>incoming file and local file</li>
-      <li>incoming directory and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>update move destination<br>
           (using this option is recommended)</li>
       <li>break move and update any moved away children<br>
@@ -257,10 +259,6 @@ users.  We'll cover those in this sectio
       <li>move an item</li>
     </ul></td>
     <td><ul>
-      <li>incoming file and local file</li>
-      <li>incoming directory and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>apply change to move destination<br>
     </ul></td>
   </tr>
@@ -274,10 +272,6 @@ users.  We'll cover those in this sectio
       <li>any change inside a directory</li>
     </ul></td>
     <td><ul>
-      <li>incoming nothing and local file</li>
-      <li>incoming nothing and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>ignore deletion<br>
       <li>accept deletion<br>
     </ul></td>
@@ -291,10 +285,6 @@ users.  We'll cover those in this sectio
       <li>add an item</li>
     </ul></td>
     <td><ul>
-      <li>incoming file and local file</li>
-      <li>incoming directory and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>ignore incoming addition<br>
           (discards the incoming change)</li>
       <li>merge incoming and local item</li>
@@ -309,10 +299,6 @@ users.  We'll cover those in this sectio
       <li>add an item</li>
     </ul></td>
     <td><ul>
-      <li>incoming file and local file</li>
-      <li>incoming directory and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>ignore incoming addition<br>
           (discards the incoming change)</li>
       <li>merge incoming and local item<br>
@@ -331,23 +317,12 @@ users.  We'll cover those in this sectio
       <li>any change inside a directory</li>
     </ul></td>
     <td><ul>
-      <li>incoming file and local file</li>
-      <li>incoming directory and local directory</li>
-    </ul></td>
-    <td><ul>
       <li>move and merge<br>
           (applies the same move locally and merges items)</li>
     </ul></td>
   </tr>
 </table>
 
-<p>Note that, in particular, most cases where files clash with directories
-   are not yet handled.</p>
-
-<p>At present, the conflict resolver can be used interactively or called
-   from Subversion's client API. There is no support for non-interactive
-   conflict resolution with the <tt>svn</tt> command yet.
-
 </div>  <!-- conflict-resolver -->
 
 </div>  <!-- new-features -->



Mime
View raw message