svn commit: r1138978 - /subversion/branches/1.6.x/STATUS

[da...@apache.org]

Author: danielsh
Date: Thu Jun 23 16:48:00 2011
New Revision: 1138978

URL: http://svn.apache.org/viewvc?rev=1138978&view=rev
Log:
Nominate r1138975 (with its potential backport pain?) and conform r966167 entry to recognized syntax.

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=1138978&r1=1138977&r2=1138978&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Jun 23 16:48:00 2011
@@ -17,7 +17,7 @@ Candidate changes:
 
  * r966167
    Allow passing --with-jdk to gen-make.py
-   Backport branch in:
+   Branch:
      ^/subversion/branches/1.6.x-r966167
    Justification:
      On 64 bit windows, looking in the registry will not always return the
@@ -27,6 +27,17 @@ Candidate changes:
    Votes:
      +1: rhuijben     
 
+ * r1138975, r1138977:
+   Add a sanity check to get-deps.sh.
+   Justification:
+     Prevent a false impression as to which version of a dependency will be used.
+   Notes:
+     r1138975 is the change.  r1138977 reverts accidentally-committed local changes.
+     Note that r1138977 replaces the bogusly-committed files rather than merges
+     into them.
+   Votes:
+     +1: danielsh
+
 Veto-blocked changes:
 =====================