Re: svn commit: r29927 - trunk/subversion/svn

On Fri, Mar 14, 2008 at 9:34 PM, <kfogel_at_tigris.org> wrote:
> Author: kfogel
> Date: Fri Mar 14 21:34:50 2008
> New Revision: 29927
>
> Log:
> * subversion/svn/conflict-callbacks.c
> (svn_cl__conflict_handler): Use "s" to "show all options", where
> doing so both shows more options and shows help for all options.
>
> See this message and its thread for more information:
>
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=136061
> From: Blair Zajac <blair_at_orcaware.com>
> To: Subversion Developers <dev_at_subversion.tigris.org>
> Subject: Show all options for conflict resolution
> Date: Thu, 13 Mar 2008 15:59:44 -0700
> Message-ID: <47D9B1E0.7060505_at_orcaware.com>
>
> Modified:
> trunk/subversion/svn/conflict-callbacks.c
>
> Modified: trunk/subversion/svn/conflict-callbacks.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/conflict-callbacks.c?pathrev=29927&r1=29926&r2=29927
> ==============================================================================
> --- trunk/subversion/svn/conflict-callbacks.c Fri Mar 14 21:34:32 2008 (r29926)
> +++ trunk/subversion/svn/conflict-callbacks.c Fri Mar 14 21:34:50 2008 (r29927)
> @@ -402,12 +402,12 @@ svn_cl__conflict_handler(svn_wc_conflict
>
> prompt = apr_pstrcat(subpool, prompt, ",\n ", NULL);
> prompt = apr_pstrcat(subpool, prompt,
> - _("(h) help for more options: "),
> + _("(s) show all options: "),
> NULL);
>
> SVN_ERR(svn_cmdline_prompt_user2(&answer, prompt, b->pb, subpool));
>
> - if (strcmp(answer, "h") == 0 || strcmp(answer, "?") == 0)
> + if (strcmp(answer, "s") == 0)
> {
> SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
> _(" (p) postpone - mark the conflict to be "
> @@ -421,7 +421,7 @@ svn_cl__conflict_handler(svn_wc_conflict
> "(lose my changes)\n"
> " (l) launch - launch external tool to "
> "resolve conflict\n"
> - " (h) help - show this list\n\n")));
> + " (s) show all - show this list\n\n")));
> }
> else if (strcmp(answer, "p") == 0)
> {
> @@ -553,7 +553,7 @@ svn_cl__conflict_handler(svn_wc_conflict
> "(ignore upstream addition)\n"
> " (tf) theirs-full - accept incoming item "
> "(overwrite pre-existing item)\n"
> - " (h) help - show this list\n\n")));
> + " (h) help - show this help\n\n")));

Hmm, so it looks like the help list is brought up by (s)how in some
prompts and (h)elp in other prompts? (The difference being "will it
show more options or just the same ones".) That seems pretty
confusing to me.

Also, do we really have to remove "?" ?

--dave

> }
> if (strcmp(answer, "p") == 0)
> {
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org