subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1066091 - /subversion/site/publish/docs/release-notes/1.7.html
Date Tue, 01 Feb 2011 16:45:38 GMT
Author: pburba
Date: Tue Feb  1 16:45:37 2011
New Revision: 1066091

* site/publish/docs/release-notes/1.7.html
  Add a section on the key merge-tracking changes.  Add a
  warning re mixing 1.7 and pre-1.7 clients for merges to the
  same branch.


Modified: subversion/site/publish/docs/release-notes/1.7.html
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Tue Feb  1 16:45:37 2011
@@ -142,6 +142,15 @@ impact these changes may have.  For Subv
     <td>Fixes a race condition in <code>svnsync</code> (<a
         >issue #3546</a>).</td></tr>
+  <tr>
+    <td><a href="#subtree-mergeinfo-recording">reduced subtree mergeinfo 
+      recording</a></td>
+    <td>1.7</td>
+    <td>any</td>
+    <td>any</td>
+    <td>If both pre-1.7 clients and 1.7 clients are used to perform merges 
+      to the same branch, the pre-1.7 clients may experience slower merge 
+      performance.</td></tr>
      <td colspan="5"><sup>1</sup>Reminder: when using the <code>file://</code>
        repository access method, the Subversion program is both the client
@@ -669,12 +678,65 @@ script given in
 </div>  <!-- atomic-revprops -->
-<div class="h3" id="merge-mixed-rev-wc">
-<h3>Merges into mixed-revision working copies now disallowed by default
-  <a class="sectionlink" href="#merge-mixed-rev-wc"
+<div class="h3" id="merge-tracking-enhancements">
+<h3>Merge-Tracking Enhancements
+  <a class="sectionlink" href="#merge-tracking-enhancements"
     title="Link to this section">&para;</a>
+<p>While there are scores of bug fixes, performance improvements, and other
+changes to merge-tracking, the following are the major changes.  See the
+1.7.0 section in the <a
+file for a complete list.</p>
+<div class="h4" id="subtree-mergeinfo-recording">
+<h4>Reduced subtree mergeinfo changes
+  <a class="sectionlink" href="#subtree-mergeinfo-recording"
+    title="Link to this section">&para;</a>
+<p>Merges no longer record mergeinfo (describing the merge) on subtrees (that
+have thier own explicit mergeinfo), if the subtree was unaffected by the merge.
+This should greatly reduce the number of spurious <code>svn:mergeinfo</code>
+property changes for users who have large numbers of sutrees with explicit
+</div>  <!-- subtree-mergeinfo-recording -->
+<div class="h4" id="reintegrate-merges">
+<h4>Reintegrate merges are less restrictive
+  <a class="sectionlink" href="#reintegrate-merges"
+    title="Link to this section">&para;</a>
+<p>Reintegrate merges now succeed in the case where all the prior 'sync'
+merges were done as subtree merges, but effectively all the changes were
+merged from the target to the source.  Reintegrate also works with shallow
+targets, as long as none of the excluded subtrees are affected by the
+</div>  <!-- reintegrate-merges -->
+<div class="h4" id="merge-notifications">
+  <a class="sectionlink" href="#merge-notifications"
+    title="Link to this section">&para;</a>
+<p>Merge-tracking aware merges now produce special notifications and headers
+when a merge records mergeinfo describing a merge or elides mergeinfo.  This
+clearly differentiates between changes that are made due to application of a
+diff from the merge source and those that are simply merge-tracking
+'housekeeping' changes.</p>
+</div>  <!-- merge-notifications -->
+<div class="h4" id="merge-mixed-rev-wc">
+<h4>Merges into mixed-revision working copies now disallowed by default
+  <a class="sectionlink" href="#merge-mixed-rev-wc"
+    title="Link to this section">&para;</a>
 <p>To prevent unnecessary conflicts, <code>svn merge</code> will now fail
 with an error if the merge target is a
 <a href=""
@@ -694,6 +756,34 @@ Please use <code>svn update</code> inste
 </div>  <!-- merge-mixed-rev-wc -->
+<div class="h4" id="svn-mergeinfo-enhancements">
+<h4>The mergeinfo subcommand accounts for subtree and partial merges
+  <a class="sectionlink" href="#svn-mergeinfo-enhancements"
+    title="Link to this section">&para;</a>
+<p>The <code>svn mergeinfo</code> subcommand now flags revisions wich are
+partially merged to a target with the <code>'*'</code> decorator.  A revision
+may be partially merged due to non-inheritable mergeinfo on the target or
+because of explicit mergeinfo on some subtree of the target.  The latter case
+is ignored by default, but may be considered by using the new <code>--depth
+</code> and <code>-R</code> options for <code>svn mergeinfo</code>.</p>
+</div>  <!-- svn-mergeinfo-enhancements -->
+<div class="h4" id="svn-merge-record-only">
+<h4>Transitive record only merges
+  <a class="sectionlink" href="#svn-merge-record-only"
+    title="Link to this section">&para;</a>
+<p>Merges performed with the <code>--record-only</code> option now apply
+<code>svn:mergeinfo</code> diffs from the merge source.</p>
+</div>  <!-- svn-merge-record-only -->
+</div>  <!-- merge-tracking-enhancements -->
 </div>  <!-- enhancements -->
 <div class="h2" id="svn-1.5-deprecation">

View raw message