[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-03-15 21:56:32 CET

Colin Putney <cputney@whistler.net> writes:

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

Only delete if the merge tool reports success. I want to be able to
abort the merge and try again, or try something else.

We may want the merge tool to be configurable for each filetype, or do
we rely on an intelligent merge tool dispatching to the correct
filetype handler?

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

Again, only delete if the editor reports success.

> 3. If the wc file has been modified or the --force option is used, the
> backup fulltexts are deleted.

When does this "has been modified" check occur? Does it occur at the
point at which the resolve command is invoked, comparing the wc
against text-base? At present the wc file will always be modified,
that's the only way a conflict can occur. (Other conflict
possibilities may arise when 'svn merge' appears.)

Or does it mean comparing the wc before and after invoking the merge
tool? If so, I think the exit status of the merge tool should be used
instead. Even if I have changed the wc, if I abort my merge tool I
don't want files deleted. And for binary files I may decide to resolve
the conflict by making no changes to the wc, again I would want the
merge tool's exit status to determine whether files get deleted.

> 4. If none of the above conditions are met, svn resolve errors out
> because the conflict wasn't resolved.

Perhaps if there is no conflict the command should just exit quietly.

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:57:28 2002

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