The IDE's graphical Diff Viewer enables you to compare revisions of a file side by side using color coding to emphasize the differences between the files being compared.
You access the Diff Viewer by right-clicking a versioned file or folder (e.g. from the Projects, Files or Favorites window) and choosing Subversion > Diff. The Diff Viewer can also be accessed by selecting the Diff view for a revision in the History Viewer.
The icons in the Diff Viewer toolbar enable you to perform the following functions:
).
Displays locally modified files only.
).
Displays remotely modified files only.
).
Displays both locally and remotely modified files.
).
Goes to previous difference displayed in the diff.
).
Goes to next difference displayed in the diff.
).
Refreshes the diff in the event that you have made changes to your local
working directory externally.
).
Updates the repository version of the file displayed in the diff.
).
Commits any changes you have made in the local version to the repository.When you choose to open the Diff Viewer on a selected item, all files contained in the item display in the table located above the graphical viewer (In the event that you select a single file, only that file is displayed). The table lists all modified files and organizes information based on the following column headings:
Upon selecting a file from the table, the Diff Viewer displays differences between two versions of a file, select the table row corresponding to the desired file.
The Diff Viewer highlights changes in the files using the following color encoding.
The following icons enable you to make changes directly within the Diff Viewer
).
Inserts the highlighted text from the previous revision into the current
revision
).
Reverts the file's current version to the state of the selected previous
version.
).
Removes the highlighted text from the current version so that it mirrors the
previous version.