Comparing File Revisions in Subversion
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 (
)
and next (
)
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 (
) and Update (
) buttons. When you are finished comparing
the files, you can commit your changes using the Diff Viewer's Commit button
(
).
To generate a graphical diff comparing a repository revision to your working copy:
- Right-click a versioned file node in the Projects, Files, or
Versioning
window and choose Diff (or Subversion > Diff). The IDE displays the
results in the Diff Viewer in a new tab of the main window.
- If you want to perform a diff on all files contained in a folder, select
a folder and choose Subversion > Diff from the right-click menu. All
files that contain differences between your local version and the
repository version will be listed in the upper pane of the Diff Viewer.
You can then view individual diffs on files by clicking a file from
the list.
To make changes to a file while comparing it in the Diff Viewer:
- Navigate through differences between the two versions using the previous
difference (
)
and next difference (
)
arrow icons.
- Click any of the displayed icons to perform immediate changes
to your local copy.
- Your local copy appears in the right pane of the Diff Viewer. You can also make
changes to your local copy by typing directly into it in the Diff Viewer.
- Any changes made in the Diff Viewer are automatically saved as they occur.
The following icons enable you to make changes directly within the Diff Viewer
- 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.
- See Also
- Merging File Revisions
- Resolving Merge Conflicts
- Browsing Local File History
Legal Notices