> -----Original Message-----
> From: Michael Wood [mailto:mwood@its.uct.ac.za]
> Sent: den 11 mars 2003 08:20
> To: kfogel@collab.net
> Cc: Henrik.Viklund@hotswap.se; dev@subversion.tigris.org
> Subject: Re: Customizing Custom diff-3 executions
>
> 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.
Yes, that's basically what I want to do. I was looking for some fancy
features to support me, but I'll just do some more scripting, then!
Henrik
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 11 09:59:47 2003