Author: julianfoad Date: Mon Mar 5 10:39:45 2018 New Revision: 1825864 URL: http://svn.apache.org/viewvc?rev=1825864&view=rev Log: Fix bad conflict resolution after merge from 'publish' to 'staging'.
Modified: subversion/site/staging/docs/release-notes/1.10.html Modified: subversion/site/staging/docs/release-notes/1.10.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1825864&r1=1825863&r2=1825864&view=diff ============================================================================== --- subversion/site/staging/docs/release-notes/1.10.html (original) +++ subversion/site/staging/docs/release-notes/1.10.html Mon Mar 5 10:39:45 2018 @@ -750,25 +750,6 @@ thus ensuring that the appropriate value </div> <!-- normalize-props --> -<div class="h4" id="normalize-props"> -<h4>New <tt>--normalize-props</tt> option for <tt>svnadmin load</tt> - <a class="sectionlink" href="#normalize-props" - title="Link to this section">¶</a> -</h4> - -<p>A new <tt>--normalize-props</tt> option has been added to the -<tt>svnadmin load</tt> command. This option can be used to automatically -repair <a href="/faq.html#fix-nonLF-log">non-LF line endings</a> in properties -such as <tt>svn:log</tt> or <tt>svn:ignore</tt>. Such invalid line endings -were accepted by older servers and can be found in repository dumps of older -repositories, but are rejected by Subversion 1.6 and later.</p> - -<p>Calling <tt>svnadmin load</tt> with <tt>--normalize-props</tt> will -automatically repair all invalid property line endings found in the dumpstream, -thus ensuring that the appropriate values are loaded into the repository.</p> - -</div> <!-- normalize-props --> - <div class="h4" id="svnadmin-revprops"> <h4>New <tt>svnadmin dump-revprops</tt> and <tt>svnadmin load-revprops</tt> subcommands <a class="sectionlink" href="#svnadmin-revprops"