[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: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 31 Jul 2009 09:56:32 +0100

On Fri, Jul 31, 2009 at 09:38:03AM +0200, Daniel Näslund wrote:
> 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.

Looks like the patch is incomplete, the changes to svn_notify aren't
there.

> [[[
> 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.

Please indent your log messages like this:

[[[
* subversion/somedir/somefile.c
  (some_function): State nature and reason of the change here.
   Next line goes here (one or two leading spaces).
  (some_other_function): State nature and reason of the change here.
]]]

And no tabs anywhere (you had a tab before "(svn_cl__merge)").

Thanks,
Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377298
Received on 2009-07-31 10:56:56 CEST

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