You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.co.il> on 2008/07/10 05:57:19 UTC

Re: svn commit: r32050 - in branches/1.5.x: . subversion/libsvn_subr

dlr@tigris.org wrote on Wed, 9 Jul 2008 at 17:32 -0700:
> Author: dlr
> Date: Wed Jul  9 17:32:37 2008
> New Revision: 32050
> 
> Log:
> Merge r32023 from trunk into the 1.5.x branch, a follow up to r31884
> to fix issue #2242, which checks for a NULL username.
> 
> Votes: +1: stylesen, danielsh, dlr
> 

We still need a third +1 on this, for the same reasons as in
<http://article.gmane.org/gmane.comp.version-control.subversion.devel/101870>.

> Modified:
>    branches/1.5.x/STATUS
>    branches/1.5.x/subversion/libsvn_subr/simple_providers.c
> 

Your merge is broken, where is the change to include/private/ ?

    % svn diff --summarize ^/ -c 32023
    M      .../trunk/subversion/libsvn_subr/simple_providers.c
    M      .../trunk/subversion/include/private/svn_auth_private.h

    % svn diff --summarize ^/ -c 32050
    M      .../branches/1.5.x/STATUS
    M      .../branches/1.5.x/subversion/libsvn_subr/simple_providers.c


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r32050 - in branches/1.5.x: . subversion/libsvn_subr

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Shahaf wrote on Thu, 10 Jul 2008 at 08:57 +0300:
> dlr@tigris.org wrote on Wed, 9 Jul 2008 at 17:32 -0700:
> > Author: dlr
> > Date: Wed Jul  9 17:32:37 2008
> > New Revision: 32050
> > 
> > Log:
> > Merge r32023 from trunk into the 1.5.x branch, a follow up to r31884
> > to fix issue #2242, which checks for a NULL username.
> > 
> > Votes: +1: stylesen, danielsh, dlr
> > 
> 
> We still need a third +1 on this, for the same reasons as in
> <http://article.gmane.org/gmane.comp.version-control.subversion.devel/101870>.
> 

Reverted the merge in r32085, until it has enough votes.

> > Modified:
> >    branches/1.5.x/STATUS
> >    branches/1.5.x/subversion/libsvn_subr/simple_providers.c
> > 
> 
> Your merge is broken, where is the change to include/private/ ?
> 
>     % svn diff --summarize ^/ -c 32023
>     M      .../trunk/subversion/libsvn_subr/simple_providers.c
>     M      .../trunk/subversion/include/private/svn_auth_private.h
> 
>     % svn diff --summarize ^/ -c 32050
>     M      .../branches/1.5.x/STATUS
>     M      .../branches/1.5.x/subversion/libsvn_subr/simple_providers.c

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org