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

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

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 02 May 2008 14:12:53 -0400

glasser_at_tigris.org writes:
> Log:
> Tweaks to the "(s)how all" conflict-resolver menu.
> * subversion/svn/conflict-callbacks.c
> (svn_cl__conflict_handler): Add newlines between sections.
> Restore a section with 'mf' and 'tf'.
> Suggested by: kfogel
> cmpilato
> Other suggestions of kfogel temporarily ignored by: me


> --- trunk/subversion/svn/conflict-callbacks.c (r30953)
> +++ trunk/subversion/svn/conflict-callbacks.c (r30954)
> @@ -459,11 +459,17 @@ svn_cl__conflict_handler(svn_wc_conflict
> " (e) edit - change merged file in an editor\n"
> " (df) diff-full - show all changes made to merged file\n"
> " (r) resolved - accept merged version of file\n"
> + "\n"
> "Just deal with the conflicts (ignoring merged version):\n"
> " (dc) display-conflict - shows all conflicts\n"
> " (mc) mine-conflict - accept my version for all conflicts\n"
> " (tc) theirs-conflict - accept their version for all "
> "conflicts\n"
> + "\n"
> + "Choose one of the original files, even for non-conflicting changes:\n"
> + " (mf) mine-full - accept my version of entire file\n"
> + " (tf) theirs-full - accept their version of entire file\n"
> + "\n"
> "General:\n"
> " (p) postpone - mark the conflict to be "
> "resolved later\n"

Not sure what "temporarily" implies, so...

All I can say is, as I look at it, I find the section descriptions more
confusing than anything else.

They interfere with the formerly pure division of the information into
left and right sides. Formerly, one could scan down the left side
quickly to jump to [what you think is probably] the right option, then
flip right to sanity check. Or one could scan down the right side to
see what description looks right, then flip left to see what to type.

But now one's eye keeps hitting these speed bumps, throwing it off.
"There's text here. Hmm, I'd better read it, it might say something

This prompt is a reference resource, just like the command reference
section of the book or something. In a reference section, you organize
things by command and avoid extraneous noise. (True, a reference
section sometimes has subsection headers, but in a book they can be
distinguished typographically, which we can't do here, and that makes a
big difference.)

I really, really think these headers are a mistake and are mainly going
to annoy users. I could see blank lines, to emphasize the implicit
groupings, but these out-of-column sentences do more harm than good.


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 20:13:07 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.