On Sun, Nov 23, 2008 at 12:16:24PM +0000, Stefan Sperling wrote:
> On Sun, Nov 23, 2008 at 02:58:06AM +0100, Neels J Hofmeyr wrote:
> > I think it does. It tells people what they were trying to do, and what they
> > need to do to fix it. If we merge into an update-conflicted working copy,
> > and that merge creates more tree-conflicts... let's just leave it there.
>
> OK, let's leave it in, but can we change the output to this?
>
> + *desc = apr_psprintf(pool, _("local %s, incoming %s by %s"),
> + reason, action, operation);
I just realised that it already looks like that, it's just
saying 'upon' instead of 'by' --> bikeshed.
> Anyway, we're making up the output based on gut-feeling, not human
> interface research guidelines. So there's not much point in arguing.
> Let's just try to find a form of output we're all more or less
> happy with.
I'm happy with the current output :)
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-11-23 17:13:45 CET