Diff & merge

Diff ignore contenttype: Only interesting when diff are made with subversion itself. When set, than subversions diff ignores the content type of entries. Otherwise it will not output diffs from binaries.
Diff in revisiontree is recursive: When set, diffs made from within revisiontree view are made recursive like in all other cases, too. Otherwise only changes belonging to that folderitems are shown. How that is made depends on how you let diffs generate (from subversion itself or from external viewers).
Diff ignores white space changes: Ignore changes in the amount of white space (option "-b" to diff)
Diff ignores all white spaces: Ignore all white space (option "-w" to diff)

Diff display

Selects which kind of display for diff-content should use. Default is "kompare" If set to "External display" you must enter a valid program in "External diff display". Only if internal display is used you may see differences in properties.

External diff display

Defines what kdesvn is using for external display and how it will called. There are three ways:

<program> <parameter>: The difference will generated with subversion and put direct into standard input of the external program (eg., no temporary files needed)
<program> <parameter> %f: The difference will generated with subversion, saved into a temporary file and the parameter "%f" will replaced with that filename. This may used with for instance with a simple call to less or textviewer.
<program> <parameter> %1 %2: kdesvn let the external program make the difference. %1 and %2 will replaced with required values (filenames or foldernames). kdesvn stores content to compare in a temporary environment (when folders do a "export", when single file, does a "cat") when needed and cleans up after closing external program or closing itself.
Prefer external merge program: Select if in merge dialog "Use external program" should be checked or not as default.

External merge program

Setup the program and options for using when subversions builtin merge isn't wanted. The default is kdiff3 %s1 %s2 %t. The order of substitution variables isn't important, and them may there more than once, eg. like kdiff3 -o %t %s1 %s2 %t. This stuff is only tested with "meld" and "kdiff3". Think about that external programs mostly doesn't know any about subversion ignore-parameter so them may show lot more than expected.

Variable substitutions for external merge program

%s1: Substituted with source number one.
%s2: Substituted with source number two. If this is empty or this is equal to source one and start and end revision is same, this variable will skipped. So be carefull setting up commandlines like xxdiff --title1 %s1 --title2 %s2 %s1 %s2 %t.
%t: Substituted with target.

Conflict resolver program

You may use an external program like kdiff3 for resolving conflicts, the default is kdiff3 %o %m %n -o %t.

Variable substitution for externel conflict resolver

In paranthesis after each description an example how subversion would call the files. This options meaning are designed for kdiff3, 'cause this moment (2008-02-07) this is the only one I know supporting all parameters required for a good conflict resolving.

%o or %l: Old (local,left) version. This means the lower revsion number, eg., the start point of conflicted changes. (foo.cc.r2)
%m or %w: Mine (working) version of file, eg., what you had changed against old version. (foo.cc.mine)
%n or %r: New (remote, right) version of file. Eg, version someone other had made. (foo.cc.r3)
%t: Target name, eg., the origin name. For kdiff3 (as an example) this would be name after the "-o" parameter (= output file). (foo.cc)

Prev	Contents	Next
Subversion settings	Up	KIO / commandline