9

i tried using Meld as external diff in KdeSVN as meld -on - (settings>configure kdesvn>diff&merge) but Meld complains that the usage is wrong: 

meld: error: no such option: -o

Finished
Usage: 
  meld                        Start with an empty window
  meld <file|dir>             Start a version control comparison
  meld <file> <file> [<file>] Start a 2- or 3-way file comparison
  meld <dir> <dir> [<dir>]    Start a 2- or 3-way directory comparison
  meld <file> <dir>           Start a comparison between file and dir/file

i have no idea what parameters that i should use, could someone give me the correct command?

sterz
  • 784

2 Answers2

11

The right solution for this problem is: meld %1 %2

www.kokoti.sk
  • 136
  • 2
  • 3
2

I was experiencing a similar problem after altering this setting.

In the history-window, I was double-clicking on the modified files in the bottom-right-hand pane, assuming that would give me the diff.

Instead, kdesvn opened a window containing the text of the file.

I've now realised my mistake:

  • double-clicking = "annotate" action

In order to diff, you need to right-click the file, and select "Diff previous" in the context menu.

Thought I'd better share, in-case anyone else new to kdesvn makes the same wrong assumption.

Gurce
  • 306