[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: Zack Weinberg <zack_at_codesourcery.com>
Date: 2002-03-15 21:26:25 CET

On Fri, Mar 15, 2002 at 12:11:19PM -0800, Colin Putney wrote:
> I'd like to see this sequence of checks happen for svn resolve.
> 1. If there's a merge tool configured for the conflicted file, it gets
> launched with the wc file and the three conflict fulltexts as
> parameters. When it exits, the conflict fulltexts are deleted and the
> conflict is resolved.
> 2. If there's no merge tool and the file is not a binary file, the
> user's $EDITOR gets launched with the wc file (which has conflict
> markers) as it's target. When it exits, the conflict fulltexts are
> deleted.
> 3. If the wc file has been modified or the --force option is used, the
> backup fulltexts are deleted.
> 4. If none of the above conditions are met, svn resolve errors out
> because the conflict wasn't resolved.

I was just about to post a request for the same exact semantics. I'd
add only one thing:

If svn resolve is invoked with no arguments, it operates iteratively
on all conflicted files below the current working directory.

(hence you can just go "svn resolve" at top level and do everything at

It would be nifty if svn resolve could be told "if there is a conflict
in a file named "configure", first resolve any conflicts in files
named "configure.in", "aclocal.m4", ..., then run autoconf in the same
directory" -- but that might be excessive features. Certainly not for
cut 1 of interactive resolve.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 21:27:22 2002

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