Rational ClearCase Commands Referenceannotate
apropos
catcr
catcs
cc.icon
cc.magic
cd
chactivity
chbl
checkin
checkout
checkvob
chevent
chflevel
chfolder
chmaster
chpool
chproject
chstream
chtype
chview
clearaudit
clearbug
cleardescribe
cleardiffbl
cleardiff
clearexport_ccase
clearexport_cvs
clearexport_pvcs
clearexport_rcs
clearexport_sccs
clearexport_ssafe
clearfsimport
cleargetlog
clearhistory
clearimport
clearjoinproj
clearlicense
clearmake
clearmake.options
clearmrgman
clearprojexp
clearprompt
cleartool
clearviewupdate
clearvobadmin
comments
config_ccase
config_spec
cptype
credmap
creds
deliver
describe
diffbl
diffcr
diff
dospace
edcs
endview
env_ccase
events_ccase
export_mvfs
exports_ccase
file
find
findmerge
fmt_ccase
getcache
get
getlog
help
hostinfo
init_ccase
ln
lock
lsactivity
lsbl
lscheckout
lsclients
lscomp
lsdo
lsfolder
lshistory
ls
lslock
lsmaster
lspool
lsprivate
lsproject
lsregion
lsreplica
lssite
lsstgloc
lsstream
lstype
lsview
lsvob
lsvtree
makefile_aix
makefile_ccase
makefile_gnu
makefile_pmake
makefile_smake
makefile_sun
man
merge
mkactivity
mkattr
mkattype
mkbl
mkbranch
mkbrtype
mkcomp
mkdir
mkelem
mkeltype
mkfolder
mkhlink
mkhltype
mklabel
mklbtype
mkpool
mkproject
mkregion
mkstgloc
mkstream
mktag
mktrigger
mktrtype
mkview
mkvob
mount_ccase
mount
msdostext_mode
mvfslog
mvfsstorage
mvfstime
mvfsversion
mv
omake
pathnames_ccase
permissions
profile_ccase
promote_server
protect
protectvob
pwd
pwv
query_language
quit
rebase
recoverview
reformatview
reformatvob
register
relocate
rename
reqmaster
reserve
rgy_backup
rgy_check
rgy_passwd
rgy_switchover
rmactivity
rmattr
rmbl
rmbranch
rmcomp
rmdo
rmelem
rmfolder
rmhlink
rmlabel
rmmerge
rmname
rmpool
rmproject
rmregion
rmstgloc
rmstream
rmtag
rmtrigger
rmtype
rmver
rmview
rmvob
schedule
schemes
scrubber
setactivity
setcache
setcs
setplevel
setsite
setview
shell
snapshot.conf
softbench_ccase
space
startview
type_manager
umount
uncheckout
unlock
unregister
unreserve
update
version_selector
view_scrubber
vob_restore
vob_scrubber
vob_sidwalk
vob_snapshot
vob_snapshot_setup
wildcards_ccase
winkin
xclearcase
xcleardiff
xmldiffmrg
SYNOPSIS
DESCRIPTION
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:
- On all platforms, cleardiff can be invoked with the cleartool diff command to perform a file comparison, or with the cleartool merge subcommand to perform a merge.
- On UNIX only, ClearCase and ClearCase LT include a corresponding GUI tool, xcleardiff. This tool can be invoked with the diff –graphical and merge –graphical subcommands and through xclearcase.
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.
OPTIONS AND ARGUMENTS
- –tin·y | –win·dow (UNIX only)
- –window creates
a child process, which displays a side-by-side report in a separate 120-character
difference window. The diff command returns
immediately. To exit the difference window, type a UNIX interrupt character
(typically, CTRL+C).
–tiny is the same as –window, but uses a smaller font in a 165-character difference window.
- –dif·f_format | –ser·ial_format | –col·umns n
- –diff_format reports
both headers and differences in the same style as UNIX diff,
and suppresses the file summary from the beginning of the report.
–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.
- –hea·ders_only | –qui·et | –sta·tus_only
- –headers_only lists
only the header line of each difference. The difference lines themselves are
omitted.
–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.
- –b·lank_ignore
- When comparing and merging files, ignores
extra white space characters in text lines: leading and trailing white space
is ignored altogether; internal runs of white space characters are treated
like a single <SPACE> character.
- -favor·_contrib n (base=1,...)
- (merge only) Specifies the contributor, in numeric value, to be used
to fill in the non-changed areas of the merge output file. This option is
only valid when both the –out and –b·lank_ignore options
are used. If this option is not specified, the base contributor will be used.
- –out output-pname
- Stores the output of a merge in file output-pname.
This file is not used for input, and must not already exist.
- –bas·e pname
- Makes file pname the
base contributor for the comparison or merge. If you omit this option, the pname1 argument
becomes the base contributor, and the comparison or merge automatically runs
with the –qall option invoked.
- –q·uery | –qal·l | –abo·rt
- –query turns off
automatic merging for nontrivial merges (where two or more contributors differ
from the base contributor) and prompts you to proceed with every change in
the from-versions. Changes in the to-version are accepted unless a conflict
exists.
–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.
- pname1 pname2 ...
- The pathnames of contributors to compare
or merge. These can be view-extended or version-extended pathnames. Only one
such argument is required if you also specify a file with the –base option.
EXAMPLES
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.
- Compare
the current version of an element with a scratch copy in your home directory.
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() ); |
-| - Compare the same files, this time in a separate window and using a small font.
- Compare the most recent versions on two branches of an element.