Comparing different versions of a file

With GoLive's file comparison feature you can see the exact differences between file versions by comparing their source code. Three types of comparison are possible:

• You can compare a revision in the file history with your current local version of the file. This is useful if you have checked a file out and made changes, and haven't yet checked the file back in. The changes can be compared against any selected revision.
• You can compare two revisions in the file history with each other.
• You can compare your local version with the current server version

In each case a Compare dialog box displays the source code of the selected file versions side-by-side and highlights differences between them.

To compare a revision listed in the file history with your current local version:

1. Select a file in the site window, then click the Revision List button or choose Site > Revisions > Revision List.
2. In the Revision List dialog box, select the revision you want to compare with your current local version.
3. Click Compare to Local.

The Compare Revision to Local dialog box shows the source code of both file versions side by side. Differences between them are highlighted. The bottom left pane of the dialog box lists three possible types of differences found:

• Added in Local. The code highlighted in the left pane has been added to the local version and does not exist in the version on the server.
• Removed in Local. The code highlighted in the right pane (the server version) has been deleted in the local version.
• Changed in Local. The highlighted code has been changed in the local file. The respective code is highlighted in both versions (left and right panes).
4. Select options in the Compare Revisions dialog box:
• Previous/Next Difference to move to the previous or next difference found in the codes.
• Skip Empty Lines to ignore linefeeds added to the code for readability. (Extra linefeeds in the HTML code have no effect on the appearance of the page and so can be ignored as a difference.)
• Show Different Colors to use a different highlight color for both file versions.
• Hide Identical Lines to hide all code that is identical in both file versions. This leaves only the code differences displayed.
• Synchronize Scrolling to scroll the code in both panes simultaneously while comparing code.

To compare two revisions included in the file history:

1. Select a file in the site window, then click the Revision List button or choose Site > Revisions > Revision List.
2. In the Revision List dialog box, Ctrl-click (Windows) or Shift-click (Mac OS) the two revisions you want to compare to select them.
3. Click Compare Revisions.
4. In the Compare Revisions dialog box, select options as described earlier in step 4 for comparing a revision with the current local version.

After you have checked out and edited a file, you may want to compare the local state of the file with the state the file had before you checked it out--that is, you want to compare it with the current, still valid server version.

To compare your current local version with the current server version:

1. Do one of the following:
• With the file selected in the site window, or while in the document, choose Site > Revisions > Compare to Server, or click the Compare to Server button.
• With the file selected in the site window, or while in the document, click the Revision List button  on the Workgroup toolbar; in the Revision List dialog box, select the topmost revision, and click the Compare to Local button.
2. In the Compare Revision to Local dialog box, select options as described earlier in step 4 for comparing a revision with the current local version.