'svn revert' vs. 'svn resolve'

Hi,

Sorry to jump in this late, but I didn't see this thread until now:

Personally, I'm against changing 'svn revert' and vote for change 'svn
resolve' if changing anything.

A number of different names have been suggested as replacements for 'svn
resolve', e.g. 'svn unconflict', 'svn deconflict' and 'svn mark-resolved'.
My problem with these suggestions is that they are all somewhat long and
construed.

Hence, I support Ben Collins-Sussmans suggestion: 'svn settle'.

I find this much better than the above because,in plain English you don't
"unconflict conflicts" or "deconflict conflicts", rather you "resolve
conflicts" or, tada, "settle conflicts".

'settle' is terse, it is semantically very close to 'resolve' and, finally,
it isn't easily confused with other svn subcommands.

Regards
Michael Andersen Nexø

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 10 11:58:04 2003