subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1085010 - /subversion/branches/1.6.x/STATUS
Date Thu, 24 Mar 2011 15:50:02 GMT
Author: stsp
Date: Thu Mar 24 15:50:01 2011
New Revision: 1085010

URL: http://svn.apache.org/viewvc?rev=1085010&view=rev
Log:
* STATUS: Amend entry for 1.6.x-issue3843 branch.

Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1085010&r1=1085009&r2=1085010&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Mar 24 15:50:01 2011
@@ -241,10 +241,11 @@ Candidate changes:
   * ^/subversion/branches/1.6.x-issue3843
     Fix issue #3843, "file externals cause non-inheritable mergeinfo"
     Justification:
-      Without this fix, merges that change file externals create
-      explicit mergeinfo on file externals. This is not desirable,
-      and can cause commits to fail unless mergeinfo is manually
-      removed from the file external.
+      Without this fix, merges into working copies which contain
+      file externals create non-inheritable mergeinfo on the merge
+      target, and explicit mergeinfo on file externals and all children.
+      This is not desirable, and can cause commits to fail unless mergeinfo
+      is manually removed from the file external.
     Notes:
       The r1083883 group is much less useful without this fix.
     Votes:



Mime
View raw message