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

Re: issue 3342 - summary of conflicts and skips [was: ... 3432 ...]

From: Edmund Wong <edmund_at_belfordhk.com>
Date: Fri, 31 Jul 2009 09:47:36 +0800

Julian Foad wrote:
> Hi Daniel.
> Thanks for your interest.
> Issue #3342 <http://subversion.tigris.org/issues/show_bug.cgi?id=3342>
> is not talking about the "G foo1" notifications. It is about the message
> that says
> [[[
> Summary of conflicts:
> Text conflicts: 2
> Property conflicts: 1
> Skipped paths: 10
> ]]]
> Sorry - that's my fault for not being clear when I wrote it. I've just
> added a note to the issue to clarify this.
> To fix this, I would change the notifier function in
> subversion/svn/notify.c so that it still collects the statistics in
> 'nb->text_conflicts' etc., but does NOT call print_conflict_stats() when
> it gets an 'update_completed' or 'merge_completed' notification.
> Instead, make print_conflict_stats() a public function (named
> svn_cl__print_conflict_stats()) so that the top-level update function
> (svn_cl__update()) can call it to print the stats when the whole update
> is finished.

Hmm. I thought the solution would've been more complicated than
that. It was my (probably faulty) understanding that the collection
of stats should be decoupled with the notification baton and done
entirely (for example) during the update stage in which the stats
are collected during the traversal of the tree and then notify
the client that the stats are ready for usage and stored in the
(currently proposed struct) svn_conflict_stats_t (which basically
contains all the needed fields, i.e. int text-conflicts ).


Received on 2009-07-31 04:00:10 CEST

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