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

[PATCH] issue 3342 - summary of conflicts and skips

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 31 Jul 2009 09:25:20 +0200

> 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
> ]]]
> 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.
> Then adjust the callers (update, switch and merge) to call
> svn_cl__print_conflict_stats() after finishing the update/switch/merge
> operation.
> Does that make sense?
> - Julian

Yes. I have tried to follow your receipe. I couldn't find a way for switch to
use several targets though. The second usage form "switch --relocate
FROM TO [PATH...]" seems to only be about changing the metadata of the

I also attached a simple script I used for testing update/merge with
multple targets. There is a switch option too but it only uses a single

Fix issue #3342: Summary of conflicts printed at end of up/sw/merge
* subversion/svn/merge-cmd.c
        (svn_cl__merge): Call svn_cl__print_conflict_stats.

* subversion/svn/cl.h
        (svn_cl__print_conflict_stats): Added declaration.

* subversion/svn/update-cmd.c
        (svn_cl__update): Call svn_cl__print_conflict_stats.

* subversion/svn/switch-cmd.c
        (svn_cl__switch): Call svn_cl__print_conflict_stats.

* subversion/svn_notify.c
        (svn_cl__print_conflict_stats): Changed name from print_conflict_stats.

* subversion/svn_notify.c
        (notify): Remove references to print_conflict_stats. Do not clear
                                                counters for conflicts.

Daniel Näslund


Received on 2009-07-31 09:25:40 CEST

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