Re: Tree-conflicts: HEADS UP: update failure with tc-siblings :0

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> On Sun, 2008-11-16 at 06:39 +0100, Neels J. Hofmeyr wrote:

>> 1)
>> In libsvn_wc/update_editor.c, around line 1632 in
>> do_entry_deletion(), it says:
>>
>> [[[
>> if (tree_conflict != NULL)
>> {
>> /* Run the log immediately, so that the tree conflict is recorded. */
>> SVN_ERR(svn_wc__write_log(adm_access, *log_number, log_item, pool));
>> SVN_ERR(svn_wc__run_log(adm_access, NULL, pool));
>> *log_number = 0;
>> }
>> ]]]
>>
>> Can anyone remember why that would be necessary?
>
> I can't.

I'll give it a shot. ;) If I remove those lines, all of the incoming-
delete tree conflicts are printed in the update output, but none are
recorded persistently. The log_item stringbuf is local, unlike in
other update callbacks.

If the item has to be replaced, the deletion needs to be finished
before we add the new item. So deletion needs to run its own logs.

Steve

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org