Author: stsp
Date: Thu Sep 29 12:13:47 2011
New Revision: 1177278
URL: http://svn.apache.org/viewvc?rev=1177278&view=rev
Log:
* site/publish/docs/release-notes/1.7.html
(subtree-mergeinfo-recording): Explain that 1.7 clients won't magically
clean up existing subtree mergeinfo.
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=1177278&r1=1177277&r2=1177278&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Thu Sep 29 12:13:47 2011
@@ -1004,6 +1004,13 @@ have their own explicit mergeinfo), if t
This should greatly reduce the number of spurious <tt>svn:mergeinfo</tt>
property changes for users who have large numbers of subtrees with explicit
mergeinfo.</p>
+
+<p>If a change being merged contains svn:mergeinfo modifications these
+will still be applied, just like any other property modifications.
+So if the change being merged was itself the result of another merge
+performed with a 1.5 or 1.6 client, excessive subtree mergeinfo changes
+are still possible. Best results will be achieved for new branches
+created and maintained exclusively with 1.7 clients.</p>
</div> <!-- subtree-mergeinfo-recording -->
