Overview of File Compare/Merge

The following topics describe the File Compare/Merge tool delivered with StarTeam.

File Compare/Merge tools

The File Compare/Merge tool has three versions: Main, Embedded. and Standalone. Depending on how you start the tool, dictates the features that will be available. The ability to edit text files in a File Compare/Merge pane depends on which version of File Compare/Merge you are using, and the type of files you are comparing and merging.

The following sections describe the editing capabilities in each version of File Compare/Merge tool.

Note: You cannot edit the actual historical revision of a file in the StarTeam repository.

Main File Compare/Merge

The main File Compare/Merge window is displayed using menu commands in the client, and allows you to edit a local file, a merged base file, and a copy of a repository revision. When it opens in a separate window you are able to do the following:

Compare the contents of a local file with the tip revision stored in the StarTeam repository. You can also edit the contents of the local file from within the File Compare/Merge window, and save the changes for check-in.
Compare two revisions of a file listed on the History tab in the StarTeam application window. Editing the content of historical revisions is not allowed.
Merge the contents of a local file with the tip revision in the StarTeam repository. The merge results are stored locally, and the file status is changed to Modified in StarTeam so you can check in the file.
Edit the temporary local copy of a repository revision and save it as a file with a different name.

The Main File Compare/Merge gives you the option of viewing a third pane for displaying the merge results. You can edit the contents in the third pane and save your merged results.

You can start File Compare/Merge using context menus on selected files in the StarTeam client, or by checking in an older version of a file which causes a merge situation. You can also access File Compare/Merge directly from the View Compare/Merge tool.

Embedded File Compare/Merge

In the embedded File Compare/Merge no editing is possible. This view gives you a quick way to do a comparison of text in two files or versions of the same file, as well as compare properties of non-file items such as change requests. If you are comparing two text files, It performs a dynamic comparison of two selected files, or the selected repository file with your local working copy. It displays the text contents of both files in an embedded pair of panes at the bottom of the StarTeam window. These embedded panes only compare the contents of two text files, and do not permit editing or merging.

If you are comparing the properties of two non-file items, only the property values of each selected item display in the embedded panes.

When the embedded File Compare/Merge is activated, it immediately compares the files or properties when you do one of the following:

Select a file or other item in the upper pane, or the History pane. The comparison is between the local working copy of the item and the selected item revision in StarTeam.
Select two items in the History pane. The comparison is between the two historical revisions in StarTeam.
Select a linked item in the Link pane. The comparison is between the selected item revision and its previous revision.

Standalone File Compare/Merge

In the standalone File Compare/Merge you can edit all files being compared and merged. The standalone is started outside of the StarTeam client from the Windows Start menu.

This File Compare/Merge version compares files, folders, and images, and it can merge the contents of two text files or two folders. Unlike the main File Compare/Merge, the standalone version does not compare any local files with files that are in the StarTeam repository. It compares and merges two or three files, folders, or images that are on your local computer or network. You can edit text file contents directly in the File Compare/Merge panes, and you can move lines or blocks of text between the panes. You can also move folders between the panes during a folder comparison or merge.

File comparison flow

This procedure presents the basic high-level tasks involved in comparing and merging a local file with a file in the StarTeam repository.

Start a File Compare/Merge session to compare two files.
Resolve any differences between the files in the File Compare/Merge window.
Generate a report of the changes made during the File Compare/Merge session.
Save the merge changes.

Note: You can also merge the contents of the two files.

Next steps: