Re: svn resolve: just what does it do?

Zack Weinberg <zack@codesourcery.com> writes:

> I'm a little confused by the "svn resolve" operation which has been
> described in some messages to this list. It sounds like all it does
> is delete the conflict-marker files, after the user has fixed up the
> file under conflict by hand.

Indeed, it's just a shortcut for removing the backup files; and the
existence of the backup files are the only thing that makes svn think
a file is in a state of conflict.

> I think users are more likely to expect that "svn resolve" invokes
> some sort of interactive conflict resolution utility. That's what
> Perforce and Bitkeeper both do with that subcommand.

Perhaps Perforce and Bitkeeper users might be confused, yes. But 'svn
help resolve' specifically prints a help message that dispels this
assumption. As should any other svn documentation.

On the other hand -- now that we have 3 fulltext backup files, 'svn
resolve' very well *could* invoke a 3rd-party merge tool. It could be
configured in our ~/.subversion/ area, much like $EDITOR is. Is that
a good idea?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 20:14:26 2002