Differences Table

The Differences table of the TestStand File Diff and Merge utility displays the property differences grouped by sequences, file global variables, file properties, and types for each specified file. The Differences table contains the following columns:

• Item —The union of all the properties grouped by sequences, file global variables, file properties, and types for the files you are comparing. If an item moved to a different location in another file, click the Go To And Select Matching Moved Step button to select the matching properties in each file.
• Base —List of all the properties in the base file. This column is available only when you are comparing three files.
• File 1 —List of all the properties in the first file you select to compare.
• File 2 —List of all the properties in the second file you select to compare.
• Merged —List of all the properties in the merged file. This column is available only when you are comparing three files.

For a property that has a difference, the property uses the same background color as the File column in the file list . The property text displays differently depending on the type of difference the property represents, such as conflict, insertion, deletion, or ignored change. The utility status bar contains a key that shows how the Differences table represents conflicts, insertions, deletions, or ignored changes.

For a property that has a difference when comparing two files, click the Editing Options button in the appropriate column and select an option from the context menu for accepting the difference from the other file. When comparing three files, click the Merging Options button in the Merged column and select an option from the context menu to manually select which version you want to accept in the final merged file. The background color of the Merged column changes depending on which version you accept.

Use the breadcrumb at the top of the Differences table to navigate the hierarchy of the properties you select.

See Also

File List

Status Bar

TypeUsageList

TypeUsageList.GetIsTypeAttachedToFile

TypeUsageList.SetIsTypeAttachedToFile