Author: stsp
Date: Mon Jun 10 12:04:16 2013
New Revision: 1491430
URL: http://svn.apache.org/r1491430
Log:
* publish/docs/release-notes/1.8.html: Prevent misperception of what the
new "automatic merge" feature does by referring to it as "automatic
reintegration merge". Discussed with Julian.
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=1491430&r1=1491429&r2=1491430&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Mon Jun 10 12:04:16 2013
@@ -34,8 +34,8 @@ describes what is planned for the releas
<ul>
<li><a href="#moves"
>Working copy records moves as first-class operation</a></li>
- <li><a href="#auto-merge"
- >Improved support for automatic merging</a></li>
+ <li><a href="#auto-reintegrate"
+ >Automatic reintegration merge</a></li>
<li><a href="#iprops"
>Inherited properties</a></li>
<li><a href="#repos-dictated-config"
@@ -122,7 +122,7 @@ and what impact these changes may have.<
<td>any</td>
<td></td></tr>
<tr>
- <td><a href="#auto-merge">automatic merging</a></td>
+ <td><a href="#auto-reintegrate">Automatic reintegration merge</a></td>
<td>1.8</td>
<td>1.5</td>
<td>1.5</td>
@@ -732,9 +732,9 @@ specially. Behavioural changes include:<
</div> <!-- moves -->
-<div class="h3" id="auto-merge">
-<h3>Improved support for automatic merging (--reintegrate option deprecated)
- <a class="sectionlink" href="#auto-merge"
+<div class="h3" id="auto-reintegrate">
+<h3>Automatic reintegration merge (--reintegrate option deprecated)
+ <a class="sectionlink" href="#auto-reintegrate"
title="Link to this section">¶</a>
</h3>
@@ -770,11 +770,11 @@ reintegrated).</li>
<p>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.
-In contrast to a <tt>--reintegrate</tt> merge, an automatic merge
-into a working copy with local modifications is allowed.</p>
+In contrast to a <tt>--reintegrate</tt> merge, an automatic reintegration
+merge into a working copy with local modifications is allowed.</p>
<p>Merging to-and-fro between two branches in any order is possible
-using the automatic merge (the "<a
+using the automatic reintegration merge (the "<a
href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice";
>keep-alive dance</a>" is no longer necessary).
@@ -782,13 +782,13 @@ 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>
+likelihood of problems during future 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> <!-- auto-reintegrate -->
<div class="h3" id="iprops">
<h3>Inherited Properties
