You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2007/05/24 10:18:18 UTC
[PATCH] svn merge -g crashes if there is no client side mergeinfo
Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
Re: [PATCH] svn merge -g crashes if there is no client side mergeinfo
Posted by Kamesh Jayachandran <ka...@collab.net>.
>> No it was the behaviour you suggested pre r25068. In r25068 we changed
>> the api to differentiate between no mergeinfo(i.e no prop by name
>> svn:mergeinfo and empty svn:mergeinfo).
>>
>
> And the doc string concurs. +1 to commit, Kamesh.
>
> - Dan
>
>
Thanks done Committed at r25143.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svn merge -g crashes if there is no client side mergeinfo
Posted by Daniel Rall <dl...@collab.net>.
On Thu, 24 May 2007, Kamesh Jayachandran wrote:
> Malcolm Rowe wrote:
> >On Thu, May 24, 2007 at 03:48:18PM +0530, Kamesh Jayachandran wrote:
> >
> >>* subversion/libsvn_client/log.c
> >> (svn_client__suggest_merge_sources):
> >> Fix segfault if 'svn_client_get_mergeinfo' sets NULL mergeinfo hash.
> >>
> >>
> >
> >I wonder if it would make more sense for svn_client_get_mergeinfo()
> >to return an empty hash in this case? It would certainly be easier
> >on clients, unless there's some reason that you'd want to detect the
> >'no mergeinfo' case most of the time?
>
> No it was the behaviour you suggested pre r25068. In r25068 we changed
> the api to differentiate between no mergeinfo(i.e no prop by name
> svn:mergeinfo and empty svn:mergeinfo).
And the doc string concurs. +1 to commit, Kamesh.
- Dan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svn merge -g crashes if there is no client side
mergeinfo
Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Thu, May 24, 2007 at 06:34:39PM +0530, Kamesh Jayachandran wrote:
> Malcolm Rowe wrote:
> > On Thu, May 24, 2007 at 03:48:18PM +0530, Kamesh Jayachandran wrote:
> >
> >> * subversion/libsvn_client/log.c
> >> (svn_client__suggest_merge_sources): Fix segfault if
> >> 'svn_client_get_mergeinfo' sets NULL mergeinfo hash.
> >>
> >>
> >
> > I wonder if it would make more sense for svn_client_get_mergeinfo()
> > to return an empty hash in this case? It would certainly be easier
> > on clients, unless there's some reason that you'd want to detect the
> > 'no mergeinfo' case most of the time?
> >
> No it was the behaviour you suggested pre r25068. In r25068 we changed the
> api to differentiate between no mergeinfo(i.e no prop by name svn:mergeinfo
> and empty svn:mergeinfo).
>
I suggested that? Oh, okay, sorry for the confusion :-).
Regards,
Malcolm
Re: [PATCH] svn merge -g crashes if there is no client side mergeinfo
Posted by Kamesh Jayachandran <ka...@collab.net>.
Malcolm Rowe wrote:
> On Thu, May 24, 2007 at 03:48:18PM +0530, Kamesh Jayachandran wrote:
>
>> * subversion/libsvn_client/log.c
>> (svn_client__suggest_merge_sources):
>> Fix segfault if 'svn_client_get_mergeinfo' sets NULL mergeinfo hash.
>>
>>
>
> I wonder if it would make more sense for svn_client_get_mergeinfo()
> to return an empty hash in this case? It would certainly be easier
> on clients, unless there's some reason that you'd want to detect the
> 'no mergeinfo' case most of the time?
>
No it was the behaviour you suggested pre r25068. In r25068 we changed
the api to differentiate between no mergeinfo(i.e no prop by name
svn:mergeinfo and empty svn:mergeinfo).
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svn merge -g crashes if there is no client side
mergeinfo
Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Thu, May 24, 2007 at 03:48:18PM +0530, Kamesh Jayachandran wrote:
> * subversion/libsvn_client/log.c
> (svn_client__suggest_merge_sources):
> Fix segfault if 'svn_client_get_mergeinfo' sets NULL mergeinfo hash.
>
I wonder if it would make more sense for svn_client_get_mergeinfo()
to return an empty hash in this case? It would certainly be easier
on clients, unless there's some reason that you'd want to detect the
'no mergeinfo' case most of the time?
Regards,
Malcolm