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

Show all options for conflict resolution

From: Blair Zajac <blair_at_orcaware.com>
Date: Thu, 13 Mar 2008 15:59:44 -0700

I'm trying 1.5 for real for the first time today and was surprised to see more
options under the help option.

Why don't we show all options, specifically these?

   (mf) mine-full - accept my version of entire file (ignore their changes)
   (tf) theirs-full - accept their version of entire file (lose my changes)
   (l) launch - launch external tool to resolve conflict

Using h)elp to show more options is odd, because without reading it closely, I
almost missed that h)elp means more options, not just help.

We could use m)ore to show more, but I would rather just have all of them
available right there at the first conflict resolution and then have h)elp just
show more information, not more options.

Blair

---------------------------------------------------------------------
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-13 23:59:57 CET

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