<html><head><title>Options for Comparing and Merging Directories</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="home" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="previous" href="dothemerge.html" title="Doing A Merge"><link rel="next" href="other.html" title="Other Functions"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Options for Comparing and Merging Directories</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="dothemerge.html">Prev</a></td><td align="center" class="navCenter" width="34%">Directory Comparison and Merge with KDiff3</td><td align="right" class="navRight" width="33%">
<a accesskey="n" href="other.html">Next</a></td></tr></tbody></table><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeoptions"></a>Options for Comparing and Merging Directories</h2></div></div><div></div></div><p>
The KDiff3-preferences (menu "Settings"->"Configure KDiff3") now has
a section called "Directory Merge" with these options:
</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Recursive Directories:</em></span></span></dt><dd><p> Select whether to search directories
recursively.</p></dd><dt><span class="term"><span class="emphasis"><em>File Pattern(s):</em></span></span></dt><dd><p> Only files that match any pattern here will
be put in the tree. More than one pattern may be specified here via using
the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "*.cpp;*.h").
Default is "*". Directories need not match this pattern.</p></dd><dt><span class="term"><span class="emphasis"><em>Anti-Pattern(s):</em></span></span></dt><dd><p> Files and directories that match this pattern
will be excluded from the tree. More than one pattern may be specified here
via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
is "*.orig;*.o".</p></dd><dt><span class="term"><span class="emphasis"><em>Use CVS-Ignore:</em></span></span></dt><dd><p>
Ignore files and directories that would also be ignored by CVS.
Many automatically generated files are ignored by CVS.
The big advantage is that this can be directory specific via a local ".cvsignore"-file.
(See <a href="info:/cvs/cvsignore" target="_top">info:/cvs/cvsignore</a>.)</p></dd><dt><span class="term"><span class="emphasis"><em>Find Hidden Files and Directories:</em></span></span></dt><dd><p> On some filesystems files
have an "Hidden"-attribute. On other systems a filename starting with a dot
"." causes it to be hidden. This option allows you to decide whether to
include these files in the tree or not. Default is on.</p></dd><dt><span class="term"><span class="emphasis"><em>Follow File Links:</em></span></span></dt><dd><p> For links to files: When disabled, then
the symbolic links are compared. When enabled, then the files behind the
links are compared. Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Follow Directory Links:</em></span></span></dt><dd><p> For links to directories: When disabled,
then the symbolic links will be compared. When enabled then the link will
be treated like a directory and it will be scanned recursively. (Note that
the program doesn't check if the link is "recursive". So for example a directory
that contains a link to the directory would cause an infinite loop, and after
some time when the stack overflows or all memory is used up, crash the program.)
Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>List only deltas:</em></span></span></dt><dd><p> Only items that are not equal in all input
directories will be listed and only the changed files are visible. Hence
files that are equal in all directories won't be copied during a merge and
if the destination dir does not contain the files before the merge, you might
miss some files later. (This option is likely to be changed in a later version.)
Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>File Comparison Mode:</em></span></span></dt><dd><p>
<div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Binary Comparison:</em></span></span></dt><dd><p>
This is the default file comparison mode.
</p></dd><dt><span class="term"><span class="emphasis"><em>Full Analysis:</em></span></span></dt><dd><p>
Do a full analysis of each file and show the statistics information columns.
(Number of solved, unsolved, nonwhite and white conflicts.)
The full analysis is slower than a simple binary analysis, and much
slower when used on files that don't contain text.
(Specify the appropriate file-antipatterns.)
</p></dd><dt><span class="term"><span class="emphasis"><em>Trust the modification date:</em></span></span></dt><dd><p> If you compare big directories
over a slow network, it might be faster to compare the modification dates
and file length alone. But this speed improvement comes with the price of
a little uncertainty. Use this option with care. Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Trust the size:</em></span></span></dt><dd><p>
Similar to trusting the modification date. No real comparison happens. Two
files are considered equal if their file-sizes are equal. This is useful
when the file-copy operation didn't preserve the modification date.
Use this option with care. Default is off.</p></dd></dl></div></p></dd><dt><span class="term"><span class="emphasis"><em>Synchronize Directories:</em></span></span></dt><dd><p> Activates "Sync-Mode" when two directories
are compared and no explicit destination directory was specified. In this
mode the proposed operations will be chosen so that both source directories
are equal afterwards. Also the merge result will be written to both directories.
Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Copy newer instead of merging:</em></span></span></dt><dd><p> Instead of merging the proposed
operation will copy the newer source if changes happened. (Considered unsafe,
because it implies that the knowledge, that the other file hasn't been edited
too. Check to make sure in every case.) Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Backup files:</em></span></span></dt><dd><p> If a file or complete directory is replaced
by another or is deleted then the original version will be renamed with an
".orig" extension. If an old backup file with ".orig" extension already exists
then this will be deleted without backup. This also affects the normal merging
of single files, not only in directory-merge mode. Default is on.</p></dd></dl></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="dothemerge.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="other.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Doing A Merge </td><td width="34%" align="center" class="navCenter"><a href="dirmerge.html">Up</a></td><td width="33%" align="right" class="navRight"> Other Functions</td></tr></table></body></html>
distrib
>
Mandriva
>
10.2
>
i586
>
media
>
contrib
>
by-pkgid
>
a1a8a1511d610277a926fcdfef64386b
>
files
>
42
