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

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

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 02 May 2008 13:13:06 -0400

"David Glasser" <glasser_at_davidglasser.net> writes:
>> > Log:
>> > Retool conflict resolver menu into three sections:
>> >
>> > Edit the merged file:
>> > (e) edit - change merged file in an editor
>> > (df) diff-full - show all changes made to merged file
>> > (r) resolved - accept merged version of file
>> > Just deal with the conflicts (ignoring merged file):
>> > (dc) display-conflict - shows all conflicts
>> > (mc) mine-conflict - accept my version for all conflicts
>> > (tc) theirs-conflict - accept their version for all conflicts
>> > General:
>> > (p) postpone - mark the conflict to be resolved later
>> > (l) launch - launch external tool to resolve conflict
>> > (s) show all - show this list
>>
> I definitely appreciate the feedback. My major concern is to make
> clear that *only* e/df/r has anything to do with the merged file; if
> the user spends time on "e" but then uses either the conflict commands
> (dc/mc/tc) or the full-file commands (mf/tf), their work in the editor
> will be completely ignored.
>
> Thus, my goal is to organize commands that are intended to be used
> together together, not commands that are superficially similar.

I understand the goal now... but I wonder if communicating those kinds
of things is really possible in an interactive prompt. I think maybe
the best we can do is just clearly describe each option. You could give
a sense of grouping by simply having blank lines:

     (e) edit - change merged file in an editor
     (df) diff-full - show all changes made to merged file
     (r) resolved - accept merged version of file

     (dc) display-conflict - shows all conflicts
     (mc) mine-conflict - accept my version for all conflicts
     (tc) theirs-conflict - accept their version for all conflicts

     (p) postpone - mark the conflict to be resolved later
     (l) launch - launch external tool to resolve conflict
     (s) show all - show this list

That way there's an implication that "these things go together", but
without the extra words on the screen to worry the user.

By the way, the "(mf)" and "(tf)" options are still there, right? Just
not shown in the initial list? If so, then the "(s)" description should
be "show all options" or "show additional options" or something. Point
is, if it shows more, then "show this list" is not quite accurate,
that's all.

-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-05-02 19:13:20 CEST

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