Re: 'svn revert' vs. 'svn resolve'

On Tue, Jun 10, 2003 at 07:29:49PM +0100, Julian Foad wrote:
> $ svn conflicts-are-resolved-in foo.c
> $ svn mark-resolved foo.c
> $ svn have-resolved foo.c
> $ svn resolved foo.c
> $ svn settled foo.c

Chiming in late in agreement, FWIW:

Let 'revert' be!

'Resolve' has many good alternatives; I like 'resolved',
'settled', and 'merge-done', which have already been
suggested.

More suggestions:
- 'free' (as in, free up the file so I can proceed)
- 'proceed'
- 'continue'

I could even live with leaving it as 'resolve', as
unintuitive as it may be (I've never confused them).

But changing 'revert' would definitely be a step backward.

Bruce

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 13 06:49:37 2003