Author: pburba
Date: Tue May 17 22:07:00 2011
New Revision: 1104593
URL: http://svn.apache.org/viewvc?rev=1104593&view=rev
Log:
* STATUS: Vote and approve r1104309.
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=1104593&r1=1104592&r2=1104593&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 22:07:00 2011
@@ -53,17 +53,6 @@ Candidate changes:
Votes:
+1: pburba, stsp
- * r1104309
- Fix issue #3525 ("Locked file which is scheduled for delete causes
- tree conflict") and issue #3471 ("svn up touches file w/ lock &
- svn:keywords property").
- Justification:
- Tree conflicts are frustrating enough without flagging false ones.
- Branch:
- ^/subversion/branches/1.6.x-r1104309
- Votes:
- +1: cmpilato, rhuijben
-
Veto-blocked changes:
=====================
@@ -252,3 +241,14 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1104309
+ Fix issue #3525 ("Locked file which is scheduled for delete causes
+ tree conflict") and issue #3471 ("svn up touches file w/ lock &
+ svn:keywords property").
+ Justification:
+ Tree conflicts are frustrating enough without flagging false ones.
+ Branch:
+ ^/subversion/branches/1.6.x-r1104309
+ Votes:
+ +1: cmpilato, rhuijben, pburba
