[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: Colin Putney <cputney_at_whistler.net>
Date: 2002-03-15 21:11:19 CET

On Friday, March 15, 2002, at 11:13 AM, Ben Collins-Sussman wrote:

> 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?

I think it is.

It's counter-intuitive to have a command with such an important-looking
name that doesn't do anything but save you a few keystrokes. OTOH,
figuring out which merge tool would be appropriate and launching it with
appropriate targets would be very useful.

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.

This keeps the current behaviour intact you can still resolve the
conflict manually and then run svn resolve to delete the conflict
fulltexts but you can configure more substantive and convenient
behaviour if you want.

Cheers,

Colin

Colin Putney www.whistler.com
Information Systems (877) 932-0606
Whistler.com (604) 935-0035 x221

---------------------------------------------------------------------
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:13:18 2002

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