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

Re: Show all options for conflict resolution

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Thu, 13 Mar 2008 22:06:38 -0400

"C. Michael Pilato" <cmpilato_at_collab.net> writes:
>> Diff chunks: 4 yours + 2 theirs + 1 both + 1 conflicting
>> Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e:
>
> That's a pretty sad UI. Would it have killed them to have:
>
> more Options(o)
>
> ?
>
> I certainly think Subversion should. "Help" to me implies that you'll
> just get the same data you've already seen at the prompt but with more
> words. Never would I assume that "help" also hides additional
> operations.

Part of the problem is that our (h)elp option both shows more options
and shows the help for all options, including the ones that were already
shown in the initial summary prompt. That makes a patch like this one
somewhat more awkward than it might otherwise be:

[[[
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Use "s" to "show more 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>
]]]

Index: subversion/svn/conflict-callbacks.c
===================================================================
--- subversion/svn/conflict-callbacks.c (revision 29905)
+++ subversion/svn/conflict-callbacks.c (working copy)
@@ -402,12 +402,12 @@
 
           prompt = apr_pstrcat(subpool, prompt, ",\n ", NULL);
           prompt = apr_pstrcat(subpool, prompt,
- _("(h) help for more options: "),
+ _("(s) show more 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 @@
                 "(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 @@
                 "(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")));
             }
           if (strcmp(answer, "p") == 0)
             {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-14 03:07:12 CET

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