You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/03/04 00:26:26 UTC

svn commit: r1076879 - /subversion/site/publish/docs/release-notes/1.7.html

Author: stsp
Date: Thu Mar  3 23:26:26 2011
New Revision: 1076879

URL: http://svn.apache.org/viewvc?rev=1076879&view=rev
Log:
* site/publish/docs/release-notes/1.7.html: Mention the change made in
   r946186 in the section discussing merge-tracking enhancements.

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

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1076879&r1=1076878&r2=1076879&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Thu Mar  3 23:26:26 2011
@@ -829,6 +829,20 @@ is ignored by default, but may be consid
  
 </div>  <!-- svn-merge-record-only -->
 
+<div class="h4" id="svn-merge-sparse-no-tree-conflict">
+<h4>Merges into sparse directories no longer cause tree conflicts
+  <a class="sectionlink" href="#svn-merge-sparse-no-tree-conflict"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>Merges into shallow working copies used to cause tree conflicts on nodes
+which were affected by the merge but not present in the working copy.
+In 1.7, no tree conflict is flagged. Instead, non-inheritable subtree mergeinfo
+is created on the parents of missing nodes, so that later merges into working
+copies that are not sparse will pick up any missing changes for those nodes.</p>
+ 
+</div>  <!-- svn-merge-sparse-no-tree-conflicts -->
+
 </div>  <!-- merge-tracking-enhancements -->
 
 <div class="h3" id="server-performance-tuning">