small prompting tweak?

I got an interactive conflict when updating this morning, something like:

  Conflict received on file foo.c.
  Select: (p)ostpone, (d)iff, (e)dit, (r)esolved, (h)elp:

As soon as I saw the filename, I knew I wanted to toss my changes, and
accept the incoming version from the file instead. But there was no
option displayed to do that!

After a minute of frustration and confusion, I ran (h)elp, and was
reminded to choose (t)heirs, and all was well.

The irony here is that I'm the one who originally suggested that the
prompt only show a small subset of (the most common) operations,
rather than all possible operations. And then two months later, I
forget about this and get burned by it. :-)

I have a simple suggestion. Instead just printing (h)elp as the last
thing in the prompt, how about:

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

...so that I'm at least reminded that there *are* more options to
choose from, that I'm not locked into the small list of choices in
front of me?

Markphip also had a suggestion, that we simply replace (h)elp with
(m)ore. That could work too.

Objections/thoughts?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 4 21:22:36 2007