Enhance kdiff3 support

[mgdde]

I'd like to use kdiff3 with kdesvn. I've configured kdesvn to use kdiff3 by setting the external command to 'kdiff3 %f'

However that has not the desired effect. kdiff3 starts and displays a normal unified diff in its left panel.

Is there a way to configure kdesvn to "properly" use kdiff3 ?

If not then I'd like this introduced (e.g. like in esvn).

[mgdde]

Just installed 0.9.1 and realized there now seems to be explicit support for kdiff3 in the configuration editor.

I checked "Use other diff" (or how that's called in english). The string in "External diff" is 'kdiff3 -r HEAD:WORKING %f'.

Unfortunately I don't seem to be able to kdiff anything. Neither "diff of local changes", "diff vs HEAD" nor "Compare Revisions" will display anything as long as "External diff" (i.e. kdiff3) is selected. FWIW when I issue 'kdiff3' in a normal shell it starts as expected.

What am I doing wrong ? Or is this not yet fully functional ?

Using "Kompare" or "internal" works as expected.

[alwin]

The problem with kdiff3 is slightly different: it doesn't accept generated diff-output. Eg., up to this moment kdesvn only uses the internal diff3 mechanism of subversion, eg., it gets a diff output back.

Kompare is able to take and parse it and so display it. But kdiff3 not.

The one and only point using kdiff3 with subversion direct is - as described in handbook - usage of the kio-part. eg.,

kdiff3  ksvn+http://www.alwins-world.de/repos/kdesvn/tags/rel_0_9_1  ksvn+http://www.alwins-world.de/repos/kdesvn/trunk

than kdiff3 will generate it own diff. And this is slow :(

Sorry about that but up to now I have no idea how to integrate both tools.

[alwin]

Is done now and seems working nice.

[viewit]

if I use "kdiff3 %1 %2" like in the manual. It will open ~/user/%1 and ~/user/%2 wich are note the right files.

[alwin]

Did you try out it with kdesvn 0.10.0? eg., you realy mean eg "Diff current local changes" from within kdesvn at this version?

[anonymous]

It worked well up to version 0.13, but with v0.14 I encounter exactly the problems described above. Kdiff3 comes up, but doesn't display a diff. The same goes for Kompare.

[alwin]

Replying to anonymous:

It worked well up to version 0.13, but with v0.14 I encounter exactly the problems described above. Kdiff3 comes up, but doesn't display a diff. The same goes for Kompare.

Between 0.13.x and 0.14.x are no changes inside this stuff. And I just tested it with kdiff3 and kompare again (options %1 and %2 or %f), it works perfect. So it may good you will give some hints more what you're doing, e.g. what you're diffing.

[fdavid]

Sorry, I was wrong. With the above options it works well. The symptom was that kdiff3 worked well before the upgrade, and I encountered the above problems after the upgrade without changing anything in the configuration. Then I opened the configuration dialog and there were no options for the diff program defined. It could mean the following things: a) formerly it worked without paramters b) the new version didn't take the parameters from the old config c) I've gone totally mad ;-)

The other problem was that I tried to get it running with wrong options, which is just simply my stupidity.

Thank you for your help.

[anonymous]

I'm playing a bit around: %f works with kompare, but with kdiff3 %1 %2 works with both

[anonymous]

I'm playing a bit around:

%f works with kompare, but with kdiff3
%1 %2 works with both

[alwin]

Replying to anonymous:

I'm playing a bit around:

%f works with kompare, but with kdiff3
%1 %2 works with both

This is complete right, kdiff3 and meld aren't able reading external generarted diffs, but kompare does. So %f is an option for kompare ;)

But this is described in handbook I think if not I put it into.