[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [merge tracking] Merge tests #18 and #41 fail

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-01-24 18:46:16 CET

On Wed, 24 Jan 2007, Kamesh Jayachandran wrote:
...
> r21903 has introduced this.
>
> Attaching the fix for the same.
>
> r21903's log claims that it was the merge of trunk:r21698-21901. But the
> change to subversion/libsvn_client/prop_commands.c seems a local change,
> i.e not from trunk.

Looks like I actually injected this error leak way back on 2006-09-25
(in r21630).

Kamesh, fantastic job tracking this problem down, and solid patch
submission. Committed as r23211.

- Dan

 
> [[[
> Fix aborts on merge-tests 18 and 41 due to not clearing the ignore error.
>
> * subversion/libsvn_client/prop_commands.c
> (wc_walker_error_handler):
> Clear the ignored error.
>
> Patch by: kameshj
> Found by: dlr
> ]]]

> Index: subversion/libsvn_client/prop_commands.c
> ===================================================================
> --- subversion/libsvn_client/prop_commands.c (revision 23183)
> +++ subversion/libsvn_client/prop_commands.c (working copy)
> @@ -721,8 +721,15 @@
> apr_pool_t *pool)
> {
> /* Suppress errors from missing paths. */
> - return (svn_error_root_cause_is(err, SVN_ERR_WC_PATH_NOT_FOUND) ?
> - SVN_NO_ERROR : err);
> + if (svn_error_root_cause_is(err, SVN_ERR_WC_PATH_NOT_FOUND))
> + {
> + svn_error_clear(err);
> + return SVN_NO_ERROR;
> + }
> + else
> + {
> + return err;
> + }
> }
>
> svn_error_t *

  • application/pgp-signature attachment: stored
Received on Wed Jan 24 18:46:34 2007

This is an archived mail posted to the Subversion Dev mailing list.