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

Re: [PATCH] print conflict statistics after update/merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 17 Oct 2008 16:46:55 +0100

On Fri, Oct 17, 2008 at 04:36:42PM +0100, Stefan Sperling wrote:
> On Fri, Oct 17, 2008 at 04:19:08PM +0100, Julian Foad wrote:
> > OK. As a bikeshed, rather than trying to print each message in the most
> > natural-sounding English, I would write something more like:
> >
> > Summary of conflicts:
> > 1 text conflicts
> > 2 tree conflicts
> > 2 skipped paths
>
> Yes, that looks good.
> I'll make it print it like that, and commit.

Ended up formatting it slightly differently, but anyway, r33716.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-17 17:49:55 CEST

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