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/05/17 15:54:57 UTC

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

Author: stsp
Date: Tue May 17 13:54:57 2011
New Revision: 1104254

URL: http://svn.apache.org/viewvc?rev=1104254&view=rev
Log:
* STATUS: Approve r1100213.

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=1104254&r1=1104253&r2=1104254&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 13:54:57 2011
@@ -62,13 +62,6 @@ Candidate changes:
    Votes:
      +1: pburba, stsp
 
- * r1100213, rep-cache.c only
-   In FSFS, identify a corruption condition, and don't mask other (unknown)
-   corruption conditions.
-   Votes:
-     +1: danielsh, gstein
-     +0: stsp (trunk commit reviews fine, but there are merge conflicts)
-
  * r939000, r939002, r1102803
    Provide clueful error when editor drive refers revision > HEAD.
    This situation would normally occur in master-slave setup.
@@ -291,3 +284,12 @@ Approved changes:
            justifications don't seem to refer to issue #3445. Please can we
            separate these changes and clearly describe each one? And update
            the r878607 log msg.)
+
+ * r1100213, rep-cache.c only
+   In FSFS, identify a corruption condition, and don't mask other (unknown)
+   corruption conditions.
+   Notes:
+     There is a merge conflict in fs_fs.c but we don't want to backport
+     this change. Just revert that file after merging r1100213 from trunk.
+   Votes:
+     +1: danielsh, gstein, stsp