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

[cm...@apache.org]

Author: cmpilato
Date: Tue May 17 09:26:36 2011
New Revision: 1104081

URL: http://svn.apache.org/viewvc?rev=1104081&view=rev
Log:
Cast veto vote against r996383.  Indecision benefits noone.

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=1104081&r1=1104080&r2=1104081&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 09:26:36 2011
@@ -47,16 +47,6 @@ Candidate changes:
    Votes:
      +1: kameshj (with r878590 and r916286 groups)
 
- * r996383
-   Add shorthands for 'svn --accept=%s' values.
-   Justication:
-     Require less typing to resolve conflicts.
-   Votes:
-     +1: danielsh, blair
-     -0: rhuijben (Should we apply a change like this in a patch release?)
-     -0:  stsp (I'd say no...)
-     -0: pburba (I see no harm, but have to agree with stsp)
-
  * r1028084, r1028125, r1041638
    Fix JVM recognition on OS X Snow Leopard (10.6).
    Justification:
@@ -403,6 +393,19 @@ Approved changes:
            separate these changes and clearly describe each one? And update
            the r878607 log msg.)
 
+ * r996383
+   Add shorthands for 'svn --accept=%s' values.
+   Justication:
+     Require less typing to resolve conflicts.
+   Votes:
+     +1: danielsh, blair
+     -0: rhuijben (Should we apply a change like this in a patch release?)
+     -0: stsp (I'd say no...)
+     -0: pburba (I see no harm, but have to agree with stsp)
+     -1: cmpilato (to the degree that our command-line syntax is an API,
+         this would prevent rollback to prior 1.6.x versions without
+         changes to scripts which call this API)
+
  * r1036429
    Fix svnsync_tests 29 for BDB.
    Justification: