I'm not sure why this log message contains r1453780 too?  The mergeinfo
diff doesn't list that revision.

Perhaps it's due to the line with four spaces between the two entries...


svn-r...@apache.org wrote on Wed, Mar 27, 2013 at 04:00:33 -0000:
> Author: svn-role
> Date: Wed Mar 27 04:00:32 2013
> New Revision: 1461405
> 
> URL: http://svn.apache.org/r1461405
> Log:
> Reintegrate the 1.7.x-issue4257 branch:
> 
>  * r1453780
>    Reject operations on some properties for activity resources.
>    Justification:
>      It's a SEGV.
>    Votes:
>      +1: philip, breser, stefan2
>      
>  * ^/subversion/branches/1.7.x-issue4257
>    Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
>    Justification:
>      Bug can tigger assertions in the WCDB code.
>    Branch:
>      ^/subversion/branches/1.7.x-issue4257
>    Notes:
>      While not strictly related to this issue, svn_ra_neon__do_stat()
>      could probably stand to have the same patch applied as
>      svn_ra_neon__get_dir(), as this pattern of using full URLs
>      was found to be troublesome in issue #4332's research, too.
>    Votes:
>      +1: cmpilato, breser, rhuijben
> 
> Modified:
>     subversion/branches/1.7.x/   (props changed)
>     subversion/branches/1.7.x/STATUS
>     subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
>     subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
>     subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
> 
> Propchange: subversion/branches/1.7.x/
> ------------------------------------------------------------------------------
>   Merged /subversion/branches/1.7.x-issue4257:r1454456-1461404
> 
> Modified: subversion/branches/1.7.x/STATUS
> URL: 
> http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461405&r1=1461404&r2=1461405&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Wed Mar 27 04:00:32 2013
> @@ -282,20 +282,6 @@ Approved changes:
>     Votes:
>       +1: philip, breser, stefan2
>       
> - * ^/subversion/branches/1.7.x-issue4257
> -   Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
> -   Justification:
> -     Bug can tigger assertions in the WCDB code.
> -   Branch:
> -     ^/subversion/branches/1.7.x-issue4257
> -   Notes:
> -     While not strictly related to this issue, svn_ra_neon__do_stat()
> -     could probably stand to have the same patch applied as
> -     svn_ra_neon__get_dir(), as this pattern of using full URLs
> -     was found to be troublesome in issue #4332's research, too.
> -   Votes:
> -     +1: cmpilato, breser, rhuijben
> -
>   * r1425368
>     Use the right api for generating the repository dirent in mod_dav_svn.
>     Justification:
> 
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c

Reply via email to