This forum has been archived. All content is frozen. Please use KDE Discuss instead.

kdiff3 vs svn

Tags: None
(comma "," separated)
robbrown
Registered Member
Posts
4
Karma
0

kdiff3 vs svn

Wed Jul 10, 2019 11:36 pm
Anybody using kdiff3 1.7.90 with svn? Does svn diff work for you? It doesn't for me. When I downgrade kdiff3 back to 0.9.98, svn diff works again.

This is what is happening for me:

An svn command like svn diff -rn:m apparently creates a command line to kdiff3 like
Code: Select all
kdiff3 -u -L "filename (revision n)" -L "filename (revision m)" /tmp/svn-mumble /tmp/svn-mumble

(I used svn diff --diff-cmd echo ... and assumed quotation marks stripped from the output to get this.)

kdiff3 --help for both 0.9.98 and 1.7.90 says that -L means "Alternative visible name replacement. Supply this once for every input" (and -u is ignored).

If we simplify this to
Code: Select all
kdiff3 -u -L "left side" -L "right side" file1.txt file2.txt  # where file1.txt and file2.txt exist

we see this behaviour:
  • kdiff3 0.9.98 displays a two-way diff of file1.txt and file2.txt with file1.txt identified as "left side" and file2.txt identified as "right side"
  • kdiff3 1.7.90 displays a three-way diff of "left side", "right side", and file1.txt, and complains that it cannot open "left side" and "right side".
(kdiff3 0.9.98 has the desired behaviour.)

Here is my environment:
Code: Select all
$ uname -a
Linux Greenslade 5.0.0-20-generic #21-Ubuntu SMP Mon Jun 24 09:32:09 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
$ lsb_release -dc
Description:    Ubuntu 19.04
Codename:       disco
$ svn --version
svn, version 1.10.0 (r1827917)
   compiled Nov  3 2018, 00:15:03 on x86_64-pc-linux-gnu
...

And if there is something else I should have reported, please let me know.

Comments?

Thanks.
robbrown
Registered Member
Posts
4
Karma
0


Bookmarks



Who is online

Registered users: bartoloni, Bing [Bot], Google [Bot], Sogou [Bot], Yahoo [Bot]