[Kde-extra-gear] KDiff3 subversion support as merge-tool-cmd

[Ben Boeckel]

On Sunday 26 October 2008 04:55:52 pm you wrote:
> Hi Ben,
>
> Thanks for the patch. I had a look at it, and I think it doesn't break
> anything obvious.
>
> Yet still I'm not that happy with it, because it would only work for that
> specific case of three input files and one output.
> But similar usage with only three files would be ambigious:
> "kdiff3 file1 file2 file3" could be a two file merge or a three file
> comparison. (Currently it means a three file comparison.)
>
> Currently I also don't see in the documentation
> (http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html)
> that this is what subversion expects. Is the output file a new feature? Can
> you point to where it is documented or explain how you found out?
>
> Best regards,
> Joachim
>
> Am Freitag 26 September 2008 07:36:08 schrieb Ben Boeckel:
> > Hi,
> >
> > I was looking for a way to get KDiff3 to be used as my conflict
> > resolution application for SVN when I saw that KDiff3 only supported
> > specifying an outfile by using "out" and SVN calls the merge tool with:
> >
> > merge-tool-cmd base theirs mine merged
> >
> > which KDiff3 does not support. I've made a quick patch for it. I had to
> > move the argument handling up so that it can also be used in the
> > processing. Not sure if this breaks anything (the newer Automoc isn't
> > being detected for some reason so I can't build and test).
> >
> > --Ben Boeckel
> >
> > P.S. - Please CC, I am not subscribed.

Here is the link that has a config which specifies how the command is called:

http://ice.usq.edu.au/svn/ice/downloads/latest/documentation/.ice/config

Not sure why the documentation says this. How the command is called is kind of 
important. Not sure what to do for the ambiguity though. Leaving it as a 
three-file comparison would probably work best since it's then backwards 
compatible with any scripts one might have written. Maybe subversion should 
have in the config file options for each file to compare would be 
the "cleanest" solution.

--Ben