dirdiff(1) [debian man page]
DIRDIFF(1) General Commands Manual DIRDIFF(1) NAME
dirdiff - display differences and merge changes between directory trees SYNOPSIS
dirdiff [-a|--all] [-o|--only pattern] [-I|--ignore pattern] [-r|--rcs] [-t|--bktag] [-c|--context num] [-b] [-w] [-B] [-i] [-d] [-S] [-k] dir1 dir2 ... OPTIONS
-a,--all Don't exclude any files. -o,--only pattern Only process files matching pattern. -I,--ignore pattern Don't process files matching pattern. -r,--rcs Ignore differences in RCS strings. -t,--bktag Ignore differences in Bitkeeper strings. -c,--context num Set number of lines of context to show. -b,-w,-B,-i,-d Pass these on to diff. -S Show files that are the same in the file list. -K Enable bitkeeper support. DESCRIPTION
Dirdiff is a graphical tool for displaying the differences between directory trees (up to 5) and for merging changes from one tree into another. At startup, dirdiff displays a main window with a list of the files that are different between the trees. Colored squares are used to indicate the relative ages of the versions. Files are like leaves on a deciduous tree: the newest ones are green, and then they turn yel- low, orange, and red as they get older. Missing files are black, and directories are white. To see the differences between two versions of a file, double-click on the file name. By default, the first and last versions are com- pared, but this can be changed using the Diff menu in the main window. In the differences window, there are checkboxes to the left of all the sections which are different. You can use button 1 to select an individual checkbox, or shift-button 1 or button 3 to select a whole group. Selecting a line means that you are asking for that change to be made when you update either of the files using the Merge menu. The line will be removed if it is already present or added if it is not present. To copy from one tree to another, click on the file name and select the appropriate copy operation from the Copy menu of the main window. Selecting Make patch from the File menu of the main window produces a file describing the changes between the files that can be applied by the patch tool. You can edit the patch before saving, and may wish to add explanatory text, instructions, or patch Prereq lines at the beginning. To save the patch, enter a filename in the patch window relative to the current directory, and choose Save. This will also close the window. If you are sending out patches, then the from directory should be the original version of the source. Try to make sure that the two files have the same number of leading directories. See the patch(1) man page for more information. NOTES
Dirdiff needs to be able to load the libfilecmp.so.0.0 shared library for the -r or -t flags to work. SEE ALSO
diff(1) patch(1) AUTHOR
Paul Mackerras May 2002 DIRDIFF(1)
Check Out this Related Man Page
COMBINEDIFF(1) Man pages COMBINEDIFF(1) NAME
combinediff - create a cumulative unified patch from two incremental patches SYNOPSIS
combinediff [[-p n] | [--strip-match=n]] [[-U n] | [--unified=n]] [[-d PAT] | [--drop-context=PAT]] [[-q] | [--quiet]] [[-z] | [--decompress]] [[-b] | [--ignore-space-change]] [[-B] | [--ignore-blank-lines]] [[-i] | [--ignore-case]] [[-w] | [--ignore-all-space]] [[--interpolate] | [--combine]] diff1 diff2 combinediff {[--help] | [--version]} DESCRIPTION
combinediff creates a unified diff that expresses the sum of two diffs. The diff files must be listed in the order that they are to be applied. For best results, the diffs must have at least three lines of context. Since combinediff doesn't have the advantage of being able to look at the files that are to be modified, it has stricter requirements on the input format than patch(1) does. The output of GNU diff will be okay, even with extensions, but if you intend to use a hand-edited patch it might be wise to clean up the offsets and counts using recountdiff(1) first. Note, however, that the two patches must be in strict incremental order. In other words, the second patch must be relative to the state of the original set of files after the first patch was applied. The diffs may be in context format. The output, however, will be in unified format. OPTIONS
-p n, --strip-match=n When comparing filenames, ignore the first n pathname components from both patches. (This is similar to the -p option to GNU patch(1).) -q, --quiet Quieter output. Don't emit rationale lines at the beginning of each patch. -U n, --unified=n Attempt to display n lines of context (requires at least n lines of context in both input files). (This is similar to the -U option to GNU diff(1).) -d pattern, --drop-context=PATTERN Don't display any context on files that match the shell wildcard pattern. This option can be given multiple times. Note that the interpretation of the shell wildcard pattern does not count slash characters or periods as special (in other words, no flags are given to fnmatch). This is so that "*/basename"-type patterns can be given without limiting the number of pathname components. -i, --ignore-case Consider upper- and lower-case to be the same. -w, --ignore-all-space Ignore whitespace changes in patches. -b, --ignore-space-change Ignore changes in the amount of whitespace. -B, --ignore-blank-lines Ignore changes whose lines are all blank. -z, --decompress Decompress files with extensions .gz and .bz2. --interpolate Run as "interdiff". See interdiff(1) for more information about how the behaviour is altered in this mode. --combine Run as "combinediff". This is the default. --help Display a short usage message. --version Display the version number of combinediff. BUGS
The -U option is a bit erratic: it can control the amount of context displayed for files that are modified in both patches, but not for files that only appear in one patch (which appear with the same amount of context in the output as in the input). SEE ALSO
interdiff(1) AUTHOR
Tim Waugh <twaugh@redhat.com> Package maintainer patchutils 23 Jan 2009 COMBINEDIFF(1)