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

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 05 Feb 2008 00:50:28 -0500

kfogel_at_tigris.org writes:
> --- trunk/subversion/svn/conflict-callbacks.c (original)
> +++ trunk/subversion/svn/conflict-callbacks.c Mon Feb 4 21:32:46 2008
> @@ -378,10 +390,12 @@
>
> prompt = apr_pstrdup(subpool, _("Select: (p)ostpone"));
> if (diff_allowed)
> - prompt = apr_pstrcat(subpool, prompt, _(", (d)iff, (e)dit"),
> + prompt = apr_pstrcat(subpool, prompt,
> + _(", (D)iff-all, (e)dit"),
> NULL);
> else
> - prompt = apr_pstrcat(subpool, prompt, _(", (m)ine, (t)heirs"),
> + prompt = apr_pstrcat(subpool, prompt,
> + _(", (M)ine-all, (T)heirs-all"),
> NULL);
> if (performed_edit)
> prompt = apr_pstrcat(subpool, prompt, _(", (r)esolved"), NULL);

This is the one part of the change I worry about: the addition of the
"-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
go longer than 80 columns:

   Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

One solution would be to put the "Select:" on a line by itself. The
two possible prompts would then look like this:

   Select:
    (p)ostpone, (D)iff-all, (e)dit, (r)esolved, (h)elp for more options:

   Select:
    (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

That would even give us room to be a bit less terse...

   Select one of the following:
    (p)ostpone, (D)iff-all, (e)dit, (r)esolved, (h)elp for more options:

   Select one of the following:
    (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

...or something. Or maybe someone has another solution; anyway, I
wanted to call this out and see what people think. People, what do
you think?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-05 06:57:08 CET

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