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

Re: [PATCH v3] - summary of conflicts and skips

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

Double gah! Still no patch, just the original message. I'm a mutt user.
Could the new patch to tigris be the cause? Trying with a diff ending.

> Gah! No patch attached. Strange... Trying again.
 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.


Received on 2009-07-31 09:39:01 CEST

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