Documentation for FishEye 3.0.x. Documentation for other versions is available too.

This page describes FishEye's innovative 'side-by-side diff' view that shows how a file's content has changed, compared on the left and right hand sides of the screen.

On this page:

Opening the side-by-side diff view

To open FishEye's side by side diff view:

  1. Open the source code view for the file in question.
  2. Select a range of revisions to compare.
  3. Choose View > Side by Side Diff.

Screenshot: Choosing a Revision Range for the Diff


The left and right panes of the side-by-side diff view can scroll independently, and the view stays anchored around a central point. Colour coding is used to illustrate where lines have been added (green highlights) and where lines have been removed (red highlights). Grey highlights indicate that a line's internal content has changed. Each addition or deletion is linked to the adjacent pane by a coloured triangle that shows the location of that change in the comparison file.

Screenshot: FishEye's Side by Side Diff View

Understanding side-by-side diffs

Features of the side-by-side diff are referenced in the annotated screenshot below.

1. Added lines are highlighted green, displayed in the right hand pane.
2. Edited lines are highlighted grey, with minor sections highlighted red and green to show deletions and additions.
3. Deleted lines are highlighted red, displayed in the left hand pane.
4. Line numbers in the margin are permanent links ("permalinks") that can be sent to colleagues. When they open those links, the view will automatically open in side by side diff mode.

Screenshot: Elements of the Side by Side Diff View

Alternative ways to open side-by-side diffs

From the FishEye Dashboard

You can also open side by side diffs from the Dashboard screens, by clicking the 'Delta' triangle icon next to an item when it appears in the stream of events. This will open the file in the diff view. If you have currently selected side by side diff as the viewing mode, then the diff will automatically be displayed in that mode. If not, you can select side by side diff from the 'View' menu.

From the Revisions History view

When in the revisions view, you can show a diff by checking the boxes next to two revisions, then clicking the 'Diff' button in the top control bar. If you have currently selected side by side diff as the viewing mode, then the diff will automatically be displayed in that mode. If not, you can select side by side diff from the View menu.

You can also launch into a diff of the latest revision and the second most recent by clicking 'Latest Diff' in the top control bar.

  • No labels

1 Comment

  1. Laszlo Kremer

    If you select side-by-side view, and you go to a changeset and view the files there, the side-by-side view remains, but you can control the column width. 

 

 

 Except where otherwise noted, content in this space is licensed under a Creative Commons Attribution 2.5 Australia License.