You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2010/11/24 16:55:06 UTC

svn commit: r1038655 - /subversion/branches/1.5.x/STATUS

Author: stsp
Date: Wed Nov 24 15:55:06 2010
New Revision: 1038655

URL: http://svn.apache.org/viewvc?rev=1038655&view=rev
Log:
* STATUS (for 1.5.x): Nominate r873346 and r879357.

Modified:
    subversion/branches/1.5.x/STATUS

Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1038655&r1=1038654&r2=1038655&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Wed Nov 24 15:55:06 2010
@@ -184,6 +184,20 @@ Candidate changes for 1.5.8:
    Votes:
      +1: stsp
 
+ * r873346, r879357
+   Make the configure script handle newer versions of neon.
+   Justification:
+     Without this the build fails with newer neon versions,
+     unless the neon version check is disabled during configure.
+   Notes:
+     r873346 merges cleanly. But r879357 introduces 2 text conflicts.
+     These can be resolved with the 'theirs-conflict' (or 'X-(') choice.
+     Doing so will bump versions of some other deps in the
+     construct-rolling-environment.sh script, but Hyrum was planning
+     on doing so anyway.
+   Votes:
+     +1: stsp
+
 Approved changes:
 =================