cleardiff is a line-oriented file comparison and merge utility with a character-based user interface. It can process up to 32 files. cleardiff has some alternative interfaces:
Note: You cannot compare directory versions with cleardiff; you must use diff. (The diff command first analyzes the directory versions, then calls cleardiff, using the type manager mechanism.)
For discussions of how files are compared and merged, see the diff and merge reference pages.
–tiny is the same as –window, but uses a smaller font in a 165-character difference window.
–serial_format reports differences with each line containing output from a single file, instead of using a side-by-side format.
–columns establishes the width of a side-by-side report. The default width is 80 (that is, only the first 40 or so characters of corresponding difference lines appear). If n does not exceed the default width, this option is ignored.
Note: Any of the following options can be invoked with the diff –options or merge –options commands.
–quiet suppresses the file summary from the beginning of the report.
–status_only suppresses all output, returning only an exit status: a 0 status indicates that no differences were found; a 1 status indicates that one or more differences were found. This option is useful in shell scripts.
–qall turns off automatic acceptance of changes in which only one contributor differs from the base contributor. cleardiff prompts for confirmation of such changes, as it does when two or more contributors differ from the base contributor.
–abort is intended for use with scripts or batch jobs that involve merges. It allows completely automatic merges to proceed, but aborts any merge that requires user interaction.
The UNIX examples in this section are written for use in csh. If you use another shell, you may need to use different quoting and escaping conventions.
The Windows examples that include wildcards or quoting are written for use in cleartool interactive mode. If you use cleartool single-command mode, you may need to change the wildcards and quoting to make your command interpreter process the command appropriately.
In cleartool single-command mode, cmd-context represents the UNIX shell or Windows command interpreter prompt, followed by the cleartool command. In cleartool interactive mode, cmd-context represents the interactive cleartool prompt.
Note: In the UNIX examples that follow, arguments and output that show multicomponent VOB tags are not applicable to ClearCase LT, which recognizes only single-component VOB tags. In this manual, a multicomponent VOB tag is by convention a two-component VOB tag of the form /vobs/vob-tag-leaf—for example, /vobs/src. A single-component VOB tag consists of a leaf only—for example, /src. In all other respects, the examples are valid for ClearCase LT.
z:\myvob> cleardiff msg.c C:\users\susan\msg.c.tmp
********************************
<<< file 1: msg.c
>>> file 2: C:\users\susan\msg.c.tmp
********************************
----------[changed 5]--------|-----------[changed to 5]------------
static char msg[256]; | static char msg[BUFSIZ];
-|-
---------[changed 9-11]------|-----------[changed to 9]------------
env_user(), | env_user(), env_home(), e+
env_home(), |-
env_time() ); |
-|
Copyright© 2003 Rational Software. All Rights Reserved.