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

Re: [PATCH v2] issue 3342 - summary of conflicts and skips

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 31 Jul 2009 08:40:54 -0400

I've gotten the patch in GMail on all of the messages you have sent.

On Fri, Jul 31, 2009 at 3:31 AM, Daniel Näslund<daniel_at_longitudo.com> wrote:
> 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.
>> ]]]
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377277

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377352
Received on 2009-07-31 14:41:17 CEST

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.