Re: Customizing Custom diff-3 executions

On Mon, Mar 10, 2003 at 11:22:28AM -0600, Karl Fogel wrote:
> Henrik.Viklund@hotswap.se writes:
> > ****Main Question:
> > I'd like to know where i can find info on what arguments are really passed
> > to the diff-3 programs and what possibilities for customization there are.
>
> I'd suggest running
>
> $ svn --diff-cmd=foo.sh etc
>
> or
>
> $ svn --diff3-cmd=foo.sh etc
>
> where `foo.sh' is a program that prints out its arguments, or saves
> them somewhere. That should tell you everything you need to know.

I'm not sure that will do what he wants. If you use
svn --diff3-cmd=FancyMergeTool, that will run the merge tool when
updating or switching to a branch or merging things instead of just when
there's a conflict, right?

It sounds like he wants a way to automatically start his merge tool with
the correct arguments only when there's a conflict, instead of manually
having to run the merge tool on blah.234234.mine, blah.234353.r1234 and
blah.455325.r1346, and then remembering to save the result to blah.

I suspect it would be best to have a script which trawls through the wc
looking for conflicted files and then calls the merge tool with the
appropriate args and calls svn resolve afterwards if appropriate.

-- 
Michael Wood <mwood@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org