You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/05/21 01:41:00 UTC
svn commit: r1125597 - /subversion/branches/1.6.x/STATUS
Author: philip
Date: Fri May 20 23:40:59 2011
New Revision: 1125597
URL: http://svn.apache.org/viewvc?rev=1125597&view=rev
Log:
* status: comment on r1036429, remove 2nd r1036429 section
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=1125597&r1=1125596&r2=1125597&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri May 20 23:40:59 2011
@@ -15,13 +15,6 @@ Status of 1.6.17:
Candidate changes:
==================
- * r1036429
- Fix svnsync_tests 29 for issue 3641.
- Justification:
- Server assert using BDB.
- Votes:
- +1: philip
-
Veto-blocked changes:
=====================
@@ -171,6 +164,9 @@ Veto-blocked changes:
-1: hwright (I'm not sure we need this: the merge conflicts, and the
assert isn't even in 1.6.x. I'm happy to remove this veto
if a proper backport branch is provided.)
+ (It merges cleanly when I try it. This change is needed now
+ that the issue 3641 branch has been merged, probably that
+ dependency was not clear. philip)
* r879766