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

[st...@apache.org]

Author: stsp
Date: Wed Nov 10 19:14:26 2010
New Revision: 1033648

URL: http://svn.apache.org/viewvc?rev=1033648&view=rev
Log:
* STATUS: Move r877219, r877239, r907644, and r1033290 into a single group.

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=1033648&r1=1033647&r2=1033648&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Nov 10 19:14:26 2010
@@ -141,30 +141,21 @@ Candidate changes:
    Votes:
      +1: cmpilato, hwright
 
- * r877219, r877239
+ * r877219, r877239, r907644, r1033290
    In Makefile.in, try svnversion from $PATH if in-tree svnversion fails.
    Justification:
      When building 1.6.x within a trunk WC there's always an error signalled
      at the end of the build. This makes scripting the build harder than
      necessary. Merging this change makes life easier for developers.
-   Votes:
-     +1: stsp
-     +0: hwright
-
- * r907644, r1033290
-   Follow-up fixes for the r877219 group.
-   r907644 makes the revision-install target use the correct trail URL
-   for the ASF repository. r1033290 makes the revision-install target work
-   with BSD make (and possibly other make implementations).
-   Justification:
-     Without these fixes, the revision-install target will report the working
-     copy as switched in svn-revision.txt on all systems. If BSD make is used,
-     it will not fall back to svnversion from $PATH if the first svnversion
-     invocation fails, and install an empty svn-revision.txt file.
+   Notes:
+     r907644 makes the revision-install target use the correct trail URL
+     for the ASF repository. r1033290 makes the revision-install target work
+     with BSD make (and possibly other make implementations).
    Branch:
      ^/subversion/branches/1.6.x-r907644
    Votes:
      +1: stsp
+     +0: hwright (r877219 and r877239 only)
 
 Veto-blocked changes:
 =====================