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

Posted to commits@subversion.apache.org by cm...@apache.org on 2010/04/19 17:49:10 UTC

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

Author: cmpilato
Date: Mon Apr 19 15:49:10 2010
New Revision: 935632

URL: http://svn.apache.org/viewvc?rev=935632&view=rev
Log:
Propose r935631 for backport.

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=935632&r1=935631&r2=935632&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Apr 19 15:49:10 2010
@@ -160,6 +160,13 @@ Candidate changes:
    Votes:
      -1: cmpilato (pending results of related security discussion)
 
+ * r935631
+   Fix one of the sanity checks in the 'svn merge --reintegrate' logic.
+   Justification:
+     Sanity checks should themselves be sane.
+   Votes:
+     +1: cmpilato
+
 Veto-blocked changes:
 =====================