Comparing File Revisions in CVS

See Also

The Diff command compares different revisions of a file and displays the differences found graphically.

Comparing File Revisions Graphically

The IDE's graphical Diff Viewer enables you to compare different versions of a file side by side using color coding to emphasize the differences between the files being compared.

The previous (last difference button) and next (next difference button) difference buttons in the toolbar enable you to navigate among the differences in the file. You can also refresh the status and update files from within the Diff Viewer using the Refresh Diff (Last difference button) and Update (Last difference button) buttons. When you are finished comparing the files, you can commit your changes using the Diff Viewer's Commit button (Last difference button).

To generate a graphical diff comparing a repository revision to your working copy:

To make changes to a file while comparing it in the Diff Viewer:

The following icons enable you to make changes directly within the Diff Viewer

See Also
Merging File Revisions
Resolving Merge Conflicts
Browsing Local File History

Legal Notices