Re: svn commit: r1417926 - in /subversion/trunk/subversion/libsvn_wc: externals.c merge.c props.c props.h update_editor.c

Philip Martin wrote:

>> URL: http://svn.apache.org/viewvc?rev=1417926&view=rev
>> Log:
>> Remove the 'base_merge' parameter from svn_wc__merge_props(),
>> instead doing a 'base merge' iff the 'new_pristine_props'
>> output parameter is given, for simplicity.

> I think this change is causing this error:
>
> W: ==32246== Conditional jump or move depends on uninitialised value(s)
> W: ==32246==    at 0x510A7F4: svn_wc__perform_props_merge (props.c:340)
>
> which is causing the ubuntu buildbot to fail:
>
> svn: E235000: In file 'subversion/libsvn_wc/props.c' line 341: assertion
> failed (new_pristine_props != NULL && new_actual_props != NULL)

Thanks.  Fixed in r1417926 + r1420766.

- Julian
Received on 2012-12-13 21:42:14 CET