[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: Jens Seidel <jensseidel_at_users.sf.net>
Date: Fri, 17 Oct 2008 16:46:16 +0200

On Fri, Oct 17, 2008 at 03:35:27PM +0100, Stefan Sperling wrote:
> We now support 3 different types of conflicts in trunk (text, prop,
> tree). I have for been contemplating the idea of reporting how many
> conflicts of each type occured during an update or merge.
> Here is a patch that implements this idea.
 
> More complicated example:
>
> --- Merging r2 through r5 into '.':
> C epsilon
> Conflict discovered in 'beta'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: p
> C beta
> C .
> There was 1 text conflict and 2 tree conflicts.
> 2 paths were skipped.

I suggest to display skipped paths. Especially if one opened an editor
to resolve conflicts in the terminal old output may have gone away.

> + SVN_ERR(svn_cmdline_printf
> + (pool, nb->text_conflicts == 1
> + ? _("There was %i text conflict")
> + : _("There were %i text conflicts"),
> + nb->text_conflicts));

The test nb->text_conflicts == 1 is specific to English. Other languages
have more complicated plural rules (e.g. Russian).

Please use ngettext() instead of gettext() (== _() ).

Jens

---------------------------------------------------------------------
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 16:47:07 CEST

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