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

Inconsistent 'show help' commands in `svn resolve` (property conflicts vs text conflicts)

From: Pavel Lyalyakin <pavel.lyalyakin_at_visualsvn.com>
Date: Mon, 13 Jun 2016 18:15:39 +0300


I've been checking the conflict resolution tool to make necessary
adjustments to SVNBook 1.8 and noticed that text conflict resolution offers
to press (s) key to show the full list of available commands (e.g. like on
this screen output[*]):
show all options (s):
(s) - show this list (also 'h', '?')
As you see, it accepts (s), (?) and (h) keys to show the list of all
available commands.

However, the property conflict resolution tool has a different text and it
does not accept (s) and (?) keys:
$ svn resolve Makefile
Conflict for property 'abc' discovered on 'Makefile'.
local add, incoming add upon update
Select: (p) postpone, (mf) my version, (tf) their version,
        (dc) display conflict, (e) edit property, (q) quit resolution,
        (h) help: s
Unrecognized option.
(h) - show this help (also '?')

Was there any special reason to switch (h)elp option to (s)how all options?

IMO, both tools and the new tree conflict resolution tool have to be
consistent when it comes to the commands they accept. But I'm not sure
whether (h)elp is better than (s)how all options as the default key for

[*]: http://svnbook.red-bean.com/en/1.8/svn.tour.cycle.html#idp8043776

With best regards,
Pavel Lyalyakin
VisualSVN Team
Received on 2016-06-13 17:16:30 CEST

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