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

svn resolve: just what does it do?

From: Zack Weinberg <zack_at_codesourcery.com>
Date: 2002-03-15 19:58:08 CET

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.

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.

Am I totally off the wall here?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 19:58:50 2002

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