Mercurial: Diff Viewer
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 in one of the following manners:
- select a version-controlled file or folder (e.g. from the Projects, Files or
Favorites window) and choose either Mercurial > Diff from the right-click menu or
Team > (Mercurial >) Diff from the main menu.
- select the Diff view from the Status Window.
The Diff Viewer tool bar provides you with the following functionality:
- Navigate among differences found in the compared files. Choose to view differences
as they appear from top to bottom by clicking the appropriate icon:
: Go to
previous difference.
: Go to next
difference.
- Refresh the status of the diff (e.g. in the event that changes to your local
working directory have been made externally), and update the status of the
repository versions of files listed in the diff:
: Update the working directory from the repository.
- Commit any changes contained in your local working directory:
: Commit the selected
item to the repository.
The Diff Viewer provides the following UI components:
Blue
( ) |
Indicates lines that have been changed since the earlier revision. |
Green
( ) |
Indicates lines that have been added since the earlier revision. |
Red
( ) |
Indicates lines that have been removed since the earlier revision. |
The following icons allow you to make changes directly to your local working copy:
Replace
( ) |
Inserts the highlighted text from the previous revision into the current revision. |
Move All
( ) |
Reverts the file's current version to the state of the selected previous version. |
Remove
( ) |
Removes the highlighted text from the current version so that it mirrors the previous version. |
Legal Notices