You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2010/02/04 16:19:41 UTC

svn commit: r906519 - /subversion/branches/1.6.x/STATUS

Author: pburba
Date: Thu Feb  4 15:19:39 2010
New Revision: 906519

URL: http://svn.apache.org/viewvc?rev=906519&view=rev
Log:
* STATUS: Nominate fix for issue #3573, r906256 and r906305.

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=906519&r1=906518&r2=906519&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Feb  4 15:19:39 2010
@@ -219,6 +219,20 @@
     Votes:
       +1: jerenkrantz, kameshj
 
+ * r906256, 906305
+   Fix issue #3573 'local non-inheritable mergeinfo changes not properly
+   merged with updated mergeinfo'
+   Notes:
+   Justification:
+     svn:mergeinfo should be mergeable, but in this issue mergeinfo changes
+     brought down by an update were not properly merged with local changes.
+   Notes:
+     r906256 is a test demonstrating the problem and r906305 is the fix.
+   Branch:
+     ^/subversion/branches/1.6.x-issue3573
+   Votes:
+     +1: pburba
+
 Veto-blocked changes:
 =====================