Diff Command Arguments
See Also
The Diff command compares different versions of a file or group of files and
prints out all of the differences found.
To run this command, right-click a file or directory and choose Diff Textual
to generate a regular textual diff, or Diff Graphical to compare file revisions
in the graphical diff viewer. The Diff Graphical command is not available on
directories. See Comparing File Revisions for more information.
 |
If you do not see all of these options, your CVS
filesystem is not set to display advanced command options. Go to the filesystem's
property sheet and set the Advanced Options property to True, or hold down
the Control key while choosing the Add command. |
You can specify the following arguments:
- Revision or Tag 1. Invokes the -r option to the version
that you specify in the text box. If no revisions or dates are specified,
the IDE compares the copy in your working directory to the HEAD revision in
the repository. If you do not specify a Revision 2, then the diffs command
compares Revision 1 with the working copy of the file.
- Revision or Tag 2. Invokes a second -r option, which
allows you to specify the version you want to compare to the version you specified
in Revision 1.
- Date 1. Invokes the -D option to select the version
that is no later than the date you specify in the text box.
- Date 2. Invokes the -D option to select the version
that is no later than the date you specify in the text box.
- Keyword Substitution. Specifies one of the following keyword substitution
options:
- Binary (-kb). Invokes the -kb option to
reuse the keyword string found in the file and suppress the interplatform
line-end conversions. The -b stands for binary and is the mode
that you use for binary files.
- Keyword and Value (-kkv). Expands to keyword and
value. This is the default keyword expansion mode.
- Keyword, Value, Locker (-kkvl). Expands to keyword
and value and includes the locker's name.
- Keyword Only(-kk). Uses the keyword name, but does
not expand the values in the keyword strings.
- Value Only(-kv). Substitutes the keyword with its
value. Once this option has been used, future substitutions will not happen.
- Reuse Old Value(-ko). Reuses the keyword string
found in the file.
- Ignore All Whitespace. Invokes the -A option to ignore
all whitespace differences..
- Ignore Changes in the Amount of White Space. Invokes the -b
option to ignore differences in the amount of whitespace.
- Ignore Case. Invokes the -C to ignore the case by
treating uppercase and lowercase versions of a letter as the same.
- Additional diff Options. Lets you specify additional command-line
options for the Diff command.
- Default Format. Uses your system's default diff format for the command.
- Context Format. Invokes the -c option to show the
output context diff format, which defaults to three lines of context for each
difference between the files.
- Unified Format. Invokes the -u option to show the
output in the unified diff format.
 |
The dialog box also includes a Global
Options tab in which you can set global CVS command options. |
Legal Notices