svn-r...@apache.org writes:

> Author: svn-role
> Date: Thu Apr 24 04:01:09 2014
> New Revision: 1589570
>
> URL: http://svn.apache.org/r1589570
> Log:
> Merge r1587968 from trunk:
>
>  * r1587968
>    Maintain data[len]=0 invariant for svn_string_t.
>    Justification:
>      Code may rely on null byte being present.
>    Notes:
>      Triggers a read beyond allocated memory on trunk but no known
>      misbehaviour on 1.8.
>    Votes:
>      +1: philip, rhuijben, stefan2
>
> Modified:
>     subversion/branches/1.8.x/   (props changed)
>     subversion/branches/1.8.x/STATUS
>     subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c
>
> Propchange: subversion/branches/1.8.x/
> ------------------------------------------------------------------------------
>   Merged /subversion/trunk:r1587968
>
> Modified: subversion/branches/1.8.x/STATUS
> URL: 
> http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1589570&r1=1589569&r2=1589570&view=diff
> ==============================================================================
> --- subversion/branches/1.8.x/STATUS (original)
> +++ subversion/branches/1.8.x/STATUS Thu Apr 24 04:01:09 2014
> @@ -303,15 +303,6 @@ Approved changes:
>     Votes:
>       +1: philip, rhuijben, stefan2
>  
> - * 1585499
> -   Build with apr-0.9.x.
> -   Justification:
> -     1.8 claims 0.9 support but it doesn't work.
> -   Branch:
> -     ^/subversion/branches/1.8.x-apr-0.9
> -   Votes:
> -     +1: philip, rhuijben, stefan2
> -
>   * r1581810, 1584342
>     Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
>     Justification:
>

The log message matches the code change but the STATUS change is wrong.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*

Reply via email to