My kdesvn and kompare now work together in perfect harmony ... Finally! kdesvn is a really great gui svn tool for KDE, but it doesn't play nice with kompare by default. Kompare is a really great gui diff app for kde.
The problem is that although kdesvn comes preconfigured to use kompare as an external diff tool, the default is to pass both revisions in as stadard input, so kompare doesn't know where to save the merge file when you are done. I have been living with this for a while now just using the command line, but it was really bugging me for a couple of reasons.
1. The integration of kdesvn with kde is so tight, very much like tortoise-svn for windows.
2. Tortoise on windoze is slick, surely Linux can do the same.
Solution:
Change the default external diff settings to:
kompare %1 %2
I guess it pays to RTFM every once in a while.
|
|
||
|
|
||
Note - only works for diff head
The above only works when diffing a local file against head. The reason is that ksvn is creates temporary files for the repository revisions. When diffing against head, it only does this for the repository HEAD revision and feeds the local file into compare, so saves affect the local file. Unfortunately there isn't an option to diff revision x against the local file and diffing between two revisions doesn't work because kdesvn is feeding to temp files into kompare.
I am trying to find a fix for this. Currently I am just writing a perl hack so I can say svndiffr file and it will ask me what revision, do a checkout in tmp of the revision and feed that and the local file to kompare.
This will cover my needs for now, but when I get some free time I will try to get this working between kdesvn and kompare.
Post new comment