Author: stsp
Date: Fri Jul 30 13:49:51 2010
New Revision: 980793
URL: http://svn.apache.org/viewvc?rev=980793&view=rev
Log:
* STATUS: Vote for r959004, 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=980793&r1=980792&r2=980793&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Jul 30 13:49:51 2010
@@ -134,15 +134,6 @@ Candidate changes:
Votes:
+1: pburba
- * r959004
- Make 'svn' raise an error when the --reintegrate flag is supplied to a
- 2-URL merge (which isn't a supported use-case).
- Justification:
- Currently, the --reintegrate option is silently ignored, which has
- led to at last one confused user.
- Votes:
- +1: cmpilato, rhuijben
-
* r959760
Fix the FSFS lock deletion code to properly clean up lock information
instead of allowing stale lock data to remain indefinitely.
@@ -311,3 +302,13 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r959004
+ Make 'svn' raise an error when the --reintegrate flag is supplied to a
+ 2-URL merge (which isn't a supported use-case).
+ Justification:
+ Currently, the --reintegrate option is silently ignored, which has
+ led to at last one confused user.
+ Votes:
+ +1: cmpilato, rhuijben
+
