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

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

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Thu, 13 Nov 2008 05:46:23 +0100

Stephen Butler wrote:
>> CMD: svn status -v -u -q ...
>> D 2 1 jrandom /A/B/E/beta
>> D C * 1 1 jrandom /A/B/E/alpha
>> D C 2 2 jrandom /A/B/E
>> D * 1 1 jrandom /A/B/lambda
>> 2 1 jrandom /A/B/F
> The missing ' C' for lambda is still missing on trunk. It appears
> that two log files are written in /A/B/.svn, for lambda and for E, and
> svn_wc__run_log() reads both of them, but the content of the first log
> file isn't written to the entry.
> Strange. I'll keep digging.

Btw, I've changed those tests to work on different nodes, but I kept this
issue showing. Now /A/B is the node that is missing a tree-conflict persistence.

And I've got a question: subversion/libsvn_wc/update_editor.c apparently
uses different logs on different occasions.

                  int log_number = 0;
                  SVN_ERR(do_entry_deletion(eb, eb->anchor, eb->target,
                                            &log_number, pool));

  return do_entry_deletion(pb->edit_baton, pb->path, path, &pb->log_number,

  int log_number = 0;
    SVN_ERR(do_entry_deletion(eb, eb->anchor, eb->target, &log_number, pool));

      SVN_ERR(svn_wc__write_log(adm_access, db->log_number, db->log_accum,

  err = flush_log(db, pool);
  if (! err && db->log_number > 0)

(and probably many more...)

I'm really confused by that log_number stuff, especially this last
condition. Could that be the cause of the update problem in my depth tests?


Received on 2008-11-13 05:46:47 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.