On Tue, Jun 2, 2009 at 8:13 PM, Neels J Hofmeyr<neels_at_elego.de> wrote:
> Paul Burba wrote:
>> On Sun, May 31, 2009 at 7:35 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>>> On Thu, May 21, 2009 at 10:22, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> I'm going to hold off on committing though for two reasons:
>>
>> First, while this fixes the problem for 1.6.x, when running this new
>> test on trunk it triggers an assert on line 2051 in
>> entries.c:write_entry():
>>
>> Â 2048 Â if (entry->keep_local)
>> Â 2049 Â Â {
>> Â 2050 Â Â Â SVN_ERR_ASSERT(working_node != NULL);
>> Â 2051 Â Â Â SVN_ERR_ASSERT(entry->schedule == svn_wc_schedule_delete);
>> Â 2052 Â Â Â working_node->keep_local = TRUE;
>> Â 2053 Â Â }
>
> <rant>Whoa, a simple NULL check affects an assert like this??
> It implies that previously, the "if" condition that you change in the patch
> evaluated a NULL pointer and did ugly stuff, if I'm following correctly.
Neels,
I should have been clearer, I meant that the assert is triggered when
running the *test* from my patch on trunk. It doesn't matter if the
change to adm_ops.c is made or not, the assert happens first.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2359777
Received on 2009-06-05 19:44:29 CEST