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

[cm...@apache.org]

Author: cmpilato
Date: Thu Jun 10 12:01:11 2010
New Revision: 953291

URL: http://svn.apache.org/viewvc?rev=953291&view=rev
Log:
Vote for r945708, approving.

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=953291&r1=953290&r2=953291&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Jun 10 12:01:11 2010
@@ -128,19 +128,6 @@ Candidate changes:
    Votes:
      +1: cmpilato, pburba
 
- * r945708
-   Fix issue #3469 "tree conflict inside of directory external causes
-   assertion to fail".
-   Justification:
-     Assertion failures are bad and tree-conflicted externals cannot
-     be reverted or resolved without this fix.
-   Branch:
-     ^/subversion/branches/1.6.x-issue3469
-     This is not a backport branch. The fix is for 1.6.x only.
-     Trunk will need a separate fix as part of wc-ng.
-   Votes:
-     +1: stsp, julianfoad
-
  * r950445, 950468
    Fix for issue #2591 "'svnadmin hotcopy' does not replicate symlinks".
    Justification:
@@ -255,3 +242,16 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r945708
+   Fix issue #3469 "tree conflict inside of directory external causes
+   assertion to fail".
+   Justification:
+     Assertion failures are bad and tree-conflicted externals cannot
+     be reverted or resolved without this fix.
+   Branch:
+     ^/subversion/branches/1.6.x-issue3469
+     This is not a backport branch. The fix is for 1.6.x only.
+     Trunk will need a separate fix as part of wc-ng.
+   Votes:
+     +1: stsp, julianfoad, cmpilato