126.96.36.199 Viewing differences using Diff command
To display the differences recursively between the cvs remote repository and your local working copy of the selected Project/screen, use this option.
These are extra settings which are helpful in viewing the differences in varied formats. They can be chosen only when needed.
Do not recurse into the sub folders: To show difference without recursing into sub-folders.
Ignore Whitespace: To ignore white spaces between lines and show the remaining differences.
Ignore case: To ignore the case differences and display the remaining differences only.
Context diff: Based on the Diff comparison options, this option displays the line by line differences of both the files separately in two entries. The changes are marked by '!' sign and the additions are marked by '+' sign and the deleted portions are marked by '-' sign.
Unified diff: This option works in the same way as Context diff, but displays the consolidated differences between the two files in a single entry.
Color diff: To show the line by line differences of the selected project/screen file using colors. The colors are used effectively to mark the changed lines, lines added to local. etc.
Note: When using the Diff option of Run CVS command screen, color diff can be viewed even after executing any other diff option. Just enable the check box 'Color Diff' and detach the status window to see the color differentiation for the previously obtained output.
Use the following options according to your requirements.
Compare your local file with the same remote revision (chosen by default)
Compare your local file against remote file with another revision/tag/branch
Compare your local file against remote file with another date
Compare two revision/tag/branch(s)
Compare the file with date