svn commit: r1387090 - /subversion/site/publish/docs/release-notes/1.8.html

[st...@apache.org]

Author: stsp
Date: Tue Sep 18 11:18:19 2012
New Revision: 1387090

URL: http://svn.apache.org/viewvc?rev=1387090&view=rev
Log:
8 publish/docs/release-notes/1.8.html: Document Julian's awesome feature!

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

Modified: subversion/site/publish/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.8.html?rev=1387090&r1=1387089&r2=1387090&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Tue Sep 18 11:18:19 2012
@@ -696,6 +696,62 @@ changes to merge-tracking, the following
 href="http://svn.apache.org/repos/asf/subversion/trunk/CHANGES">CHANGES</a>
 file for a complete list.</p>
 
+<div class="h4" id="auto-merge">
+<h4>Improved support for automatic merges (--reintegrate option deprecated)
+  <a class="sectionlink" href="#auto-merge"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>During merges which merge all eligible revisions from another
+branch, Subversion 1.8 will automatically decide whether or not
+the merge is <a
+href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate"
+>reintegrating a branch</a>.
+Therefore, reintegrating a branch does no longer require the
+<tt>--reintegrate</tt> option for correct operation.</p>
+
+<p>The <tt>--reintegrate</tt> option of <tt>svn merge</tt> is now
+deprecated and its use is discouraged. To reintegrate a branch,
+have a clean working copy of trunk and run the following command
+in its top-level directory:</p>
+
+<pre>$ svn merge ^/branches/my-branch</pre>
+
+<p>This merge will still perform the same sanity checks which
+<tt>svn merge --reintegrate</tt> performed in earlier releases:
+<ul>
+<li>The working copy must not have any local modifications.</li>
+<li>The working copy must not be a <a
+href="http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.basic.in-action.mixedrevs"
+>mixed-revision working copy</a>.</li>
+<li>The working copy must not have <a
+href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.switchwc.html"
+>switched subtrees</a>.</li>
+<li>There must be no gaps in revision ranges merged from the reintegration
+target (e.g. the trunk) to the reingration source (i.e. the branch to be
+reintegrated).</li>
+</ul>
+If any of these conditions are detected, the merge is aborted and
+the necessary steps must be taken to fix the problem before the
+branch can be reintegrated.</p>
+
+<p>Merging to-and-fro between two branches in any order is possible
+using the automatic merge (the &quot;<a
+href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice"
+>keep-alive dance</a>&quot; is no longer necessary).
+
+For best results, it is recommended to
+always merge all eligible revisions, i.e. not using the
+<tt>-r</tt> or <tt>-c</tt> options of <tt>svn merge</tt>.
+Merging just a subset of eligible revisions increases the
+likelihood of problems during future automatic merges.</p>
+
+<p>Using <tt>--reintegrate</tt> in Subversion 1.8 will force a
+reintegration merge, whether or not that's the right merge to perform
+in the given situation.</p>
+
+</div>  <!-- auto-merge -->
+
 </div>  <!-- merge-tracking-enhancements -->
 
 <div class="h3" id="hooks">