subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcor...@apache.org
Subject svn commit: r1783790 - /subversion/site/publish/docs/release-notes/1.10.html
Date Mon, 20 Feb 2017 19:50:38 GMT
Author: jcorvel
Date: Mon Feb 20 19:50:38 2017
New Revision: 1783790

URL: http://svn.apache.org/viewvc?rev=1783790&view=rev
Log:
* publish/docs/release-notes/1.10.html: put "keep working copy state" as 
   resolution option for local change "deleted directory".

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=1783790&r1=1783789&r2=1783790&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Mon Feb 20 19:50:38 2017
@@ -350,9 +350,10 @@ href="https://wiki.apache.org/subversion
     <td><ul>
       <li>any change inside directory</li>
     </ul></td>
-    <td>update, switch</td>
+    <td>update, switch, merge</td>
     <td><ul>
-      <li>...</li>
+      <li>keep working copy state (deleted directory),<br>
+      discarding incoming changes</li>
     </ul></td>
   </tr>
 </table>



Mime
View raw message