Author: philip
Date: Fri Feb 18 12:12:52 2011
New Revision: 1071975
URL: http://svn.apache.org/viewvc?rev=1071975&view=rev
Log:
* STATUS: Vote for r1058269, vote/approve r1064839, r1068988
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=1071975&r1=1071974&r2=1071975&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Feb 18 12:12:52 2011
@@ -198,7 +198,7 @@ Candidate changes:
Branch:
^/subversion/branches/1.6.x-r1058269
Votes:
- +1: stsp
+ +1: stsp, philip
* 1.6.x-fsfs-begin-txn-deadlock
Fix a deadlock that can occur when two or more multithreaded
@@ -211,14 +211,6 @@ Candidate changes:
Votes:
+1: blair
- * r1064839
- Additional fixes for issue #3270, required when the log is traversing
- complex histories that max out our internal history cache.
- Justification:
- We backported part of this fix already -- we should finish the job.
- Votes:
- +1: cmpilato, stsp
-
* r880146
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
@@ -231,15 +223,6 @@ Candidate changes:
Votes:
+1: julianfoad, stsp
- * r1068988
- Don't use globbing where it's not necessary.
- Justification:
- It's an easy optimisation well worth doing!
- Branch:
- ^/subversion/branches/1.6.x-r1068988
- Votes:
- +1: stsp, julianfoad
-
* r962377, r962378, r1063572, r1063573, r1063592
Fix svnsync handling of directory copyfrom.
Justification:
@@ -354,3 +337,20 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1064839
+ Additional fixes for issue #3270, required when the log is traversing
+ complex histories that max out our internal history cache.
+ Justification:
+ We backported part of this fix already -- we should finish the job.
+ Votes:
+ +1: cmpilato, stsp, philip
+
+ * r1068988
+ Don't use globbing where it's not necessary.
+ Justification:
+ It's an easy optimisation well worth doing!
+ Branch:
+ ^/subversion/branches/1.6.x-r1068988
+ Votes:
+ +1: stsp, julianfoad, philip (for the branch)
