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

Re: [PATCH] Re-localise conflict prompt

From: Mattias Engdegård <mattiase_at_bredband.net>
Date: Thu, 11 Apr 2013 09:45:54 +0200

10 apr 2013 kl. 20.52 skrev Mattias Engdegård:

> In this example, the valid shorthands for --accept ("mc" etc) also
> double as prompt answers, but that would not have to be the case in
> translations.

On second thought, perhaps we should just drop --accept=mc and require
the long word codes for that option instead (--accept=mine-conflicts).
The short forms would be deprecated and not documented but still
recognised, like the obscure "X-)" type of variants.

This way, there won't be any confusion between the --accept argument
and valid replies to the conflict prompt.
Received on 2013-04-11 09:46:40 CEST

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