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

Re: svn resolve: just what does it do?

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-03-17 23:11:00 CET

Colin Putney <cputney@whistler.net> writes:
> It's counter-intuitive to have a command with such an
> important-looking name that doesn't do anything but save you a few
> keystrokes.

Another option is to change the name, then... :-)

Instead of "svn resolve" (which sounds like it resolves something),
maybe "svn resolved". That sounds like something got resolved, which
is what the user is trying to indicate.

I'm all for automatically invoking a merge tool, and possibly using
its exit status to determine whether or not to change the conflict
state, but there still needs to be a way to tell Subversion
(independently of any other tool) that the conflict is resolved. The
two features are separate. We chose a bad name for the simpler
feature, so let's just use a different name.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Mar 17 23:02:36 2002

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