svn commit: r1805937 - /subversion/site/publish/docs/release-notes/1.10.html

[st...@apache.org]

Author: stsp
Date: Wed Aug 23 16:43:20 2017
New Revision: 1805937

URL: http://svn.apache.org/viewvc?rev=1805937&view=rev
Log:
Add a note about the new option --accept=recommended to 1.10 release notes.

* site/publish/docs/release-notes/1.10.html
  (accept-recommended): New section.

Suggested by: danielsh

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=1805937&r1=1805936&r2=1805937&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Wed Aug 23 16:43:20 2017
@@ -622,6 +622,23 @@ option which did not actually work in Su
 
 </div> <!-- svnbench -->
 
+<div class="h4" id="accept-recommended">
+<h4>New option <tt>--accept recommended</tt>
+  <a class="sectionlink" href="#accept-recommended"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>The new option <tt>--accept recommended</tt> will automatically
+resolve tree conflicts for which a recommended resolution option is
+available. Any other conflicts will be postponed.</p>
+
+<p>Note that <tt>--accept recommended</tt> is now the default behaviour
+if the <tt>--non-interactive</tt> option is used. In previous releases,
+the <tt>--non-interactive</tt> option implied <tt>--accept postpone</tt>
+by default instead.
+
+</div> <!-- accept-recommended -->
+
 </div> <!-- cmdline -->
 
 <div class="h3" id="server-side-improvements">