Re: svn commit: r39737 - in trunk/subversion: include/private libsvn_client libsvn_wc tests/cmdline

On Thu, Oct 01, 2009 at 06:55:40PM +0100, Stefan Sperling wrote:
> On Thu, Oct 01, 2009 at 06:30:29AM -0700, Bert Huijben wrote:
> > Author: rhuijben
> > Date: Thu Oct 1 06:30:29 2009
> > New Revision: 39737
>
> > --- trunk/subversion/libsvn_client/merge.c Thu Oct 1 06:25:05 2009 (r39736)
> > +++ trunk/subversion/libsvn_client/merge.c Thu Oct 1 06:30:29 2009 (r39737)
> > @@ -415,38 +415,46 @@ obstructed_or_missing(const char *path,
> [...]
> > + else
> > + {
> > + err = svn_wc__get_entry_versioned(&entry, merge_b->ctx->wc_ctx,
> > + local_abspath, svn_node_unknown,
> > + FALSE, FALSE, pool, pool);
> > +
> > + if (err)
> > + {
> > + svn_error_clear(err);
> > + entry = NULL;
>
> Do we really want to ignore all kinds of errors here?
> If so, can we add a comment explaning why?

Bert pointed out to me that this function does not return an svn_error_t *.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402828
Received on 2009-10-02 11:56:16 CEST