Author: cmpilato
Date: Tue May 17 10:03:39 2011
New Revision: 1104094
URL: http://svn.apache.org/viewvc?rev=1104094&view=rev
Log:
Ahem. Move veto to the correct section.
Reported by: hwright
Publicly humiliated by: hwright
Apology not provided by: hwright
Apology, should it be given, not accepted by: cmpilato
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=1104094&r1=1104093&r2=1104094&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 10:03:39 2011
@@ -275,6 +275,19 @@ Veto-blocked changes:
Discussing on list.)
-1: cmpilato (Changes semantics of svn_io_dir_walk()).
+ * 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)
+
Approved changes:
=================
@@ -303,19 +316,6 @@ 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:
