subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcor...@apache.org
Subject svn commit: r1782093 - /subversion/site/publish/docs/release-notes/1.10.html
Date Wed, 08 Feb 2017 00:39:00 GMT
Author: jcorvel
Date: Wed Feb  8 00:39:00 2017
New Revision: 1782093

URL: http://svn.apache.org/viewvc?rev=1782093&view=rev
Log:
* release-notes/1.10.html: reshuffle tree conflict resolving table (put
   local change and incoming change first, regroup, and add some rowspans)
   to try making it more intuitive.

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=1782093&r1=1782092&r2=1782093&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Wed Feb  8 00:39:00 2017
@@ -228,64 +228,44 @@ users.  We'll cover those in this sectio
 
 <table border="1">
   <tr>
-    <th>operation</th>
-    <th>incoming change</th>
     <th>local change</th>
+    <th>incoming change</th>
+    <th>operation</th>
     <th>resolution options</th>
   </tr>
   <tr>
-    <td>update, switch</td>
-    <td><ul>
-      <li>edit a file</li>
+    <td rowspan="2"><ul>
+      <li>edit file</li>
       <li>any change inside a directory</li>
     </ul></td>
     <td><ul>
-      <li>move an item</li>
-      <li>delete a directory</li>
+      <li>delete file / directory</li>
     </ul></td>
+    <td>update, switch, merge</td>
     <td><ul>
-      <li>update move destination<br>
-          (using this option is recommended)</li>
-      <li>break move and update any moved away children<br>
-          (updates items moved outside of the moved directory)</li>
+      <li>ignore deletion<br>
+      <li>accept deletion<br>
     </ul></td>
   </tr>
   <tr>
-    <td>merge</td>
-    <td><ul>
-      <li>edit a file</li>
-      <li>any change inside a directory</li>
-    </ul></td>
     <td><ul>
-      <li>move an item</li>
+      <li>move file / directory</li>
     </ul></td>
+    <td>update, switch, merge</td>
     <td><ul>
-      <li>apply change to move destination<br>
+      <li>move and merge<br>
+          (applies the same move locally and merges items)</li>
     </ul></td>
   </tr>
   <tr>
-    <td>update, merge, switch</td>
-    <td><ul>
-      <li>delete an item</li>
-    </ul></td>
-    <td><ul>
-      <li>edit a file</li>
-      <li>any change inside a directory</li>
+    <td rowspan="2"><ul>
+      <li>add item</li>
     </ul></td>
-    <td><ul>
-      <li>ignore deletion<br>
-      <li>accept deletion<br>
+    <td rowspan="2"><ul>
+      <li>add item</li>
     </ul></td>
-  </tr>
-  <tr>
     <td>update, switch</td>
     <td><ul>
-      <li>add an item</li>
-    </ul></td>
-    <td><ul>
-      <li>add an item</li>
-    </ul></td>
-    <td><ul>
       <li>ignore incoming addition<br>
           (discards the incoming change)</li>
       <li>merge incoming and local item</li>
@@ -293,13 +273,8 @@ users.  We'll cover those in this sectio
   </tr>
   <tr>
     <td>merge</td>
-    <td><ul>
-      <li>add an item</li>
-    </ul></td>
-    <td><ul>
-      <li>add an item</li>
-    </ul></td>
-    <td><ul>
+    <td>
+    <ul>
       <li>ignore incoming addition<br>
           (discards the incoming change)</li>
       <li>merge incoming and local item<br>
@@ -309,17 +284,38 @@ users.  We'll cover those in this sectio
     </ul></td>
   </tr>
   <tr>
-    <td>update, merge, switch</td>
+    <td rowspan="2"><ul>
+      <li>move item</li>
+    </ul></td>
+    <td rowspan="2"><ul>
+      <li>edit file</li>
+      <li>any change inside directory</li>
+    </ul></td>
+    <td>update, switch</td>
     <td><ul>
-      <li>move an item</li>
+      <li>apply change to move destination<br>
+          (using this option is recommended)</li>
+      <li>break move and update any moved away children<br>
+          (updates items moved outside of the moved directory)</li>
     </ul></td>
+  </tr>
+  <tr>
+    <td>merge</td>
     <td><ul>
-      <li>edit a file</li>
-      <li>any change inside a directory</li>
+      <li>apply change to move destination<br>
+          (using this option is recommended)</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><ul>
+      <li>delete directory</li>
     </ul></td>
     <td><ul>
-      <li>move and merge<br>
-          (applies the same move locally and merges items)</li>
+      <li>any change inside directory</li>
+    </ul></td>
+    <td>update, switch</td>
+    <td><ul>
+      <li>...</li>
     </ul></td>
   </tr>
 </table>



Mime
View raw message