[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-01-24 09:03:20 CET

Hi,

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.

With regards
Kamesh Jayachandran
Daniel Rall wrote:
> On Mon, 22 Jan 2007, Daniel Rall wrote:
>
>
>> Merge tests #18 and #41 currently fail with SIGABRT on the
>> merge-tracking branch. The stack shows that a pool cleanup is
>> triggering an abort(), likely due to a leaking error:
>>
> ...
>
>> As I cannot reproduce these failures on trunk, I have a feeling that
>> they're due to the recent work on use of sub-tree merge info.
>>
>
> I'm still able to reproduce this problem after reverting r23049.
>

[[[
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 *

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 24 09:02:55 2007

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