|NI TestStand 2014 Help|
|NI TestStand 2014 SP1 Help|
|TestStand 2016 Help|
|TestStand 2016 SP1 Help|
|TestStand 2017 Help|
Use the TestStand File Diff and Merge utility to compare and merge non-type differences among two or three sequence files and compare type differences among two sequence files or type palette files You can launch this utility in the following ways:
In the Sequence Editor, you can select the Edit»Diff Sequence File Against and Edit»Diff Against Saved Version menu options to launch the TestStand File Diff and Merge Utility to compare an opened sequence file to a file on disk.
The Select Files dialog box launches when you launch the utility. Use the Diff tab of the Select Files dialog box to specify two sequence files or type palette files you want to compare. Use the Merge tab to specify three sequence files you want to compare—a base file from which modified versions originate and two modified versions—and a fourth sequence file to become the resulting merged file to create.
Click the Options button in the Select Files dialog box to launch the File Differ Options dialog box, in which you can configure settings for the utility, including options for loading and automatically merging types, managing type conflict resolution, and so on.
When you specify files to compare in the Select Files dialog box and click OK, the utility launches the main window, which contains the following information:
TestStand includes a shared launching application you can use with third-party source code control (SCC) providers that support launching an external application to perform two- and three-way file diff and merge operations. The launching application determines the active version of TestStand and launches the corresponding TestStand diff application that version of TestStand installs. Using the launching application alleviates the requirement to reconfigure the SCC provider each time you activate a different version of TestStand. Launch the application by running <National Instruments>\Shared\TestStand\FileDifferLauncher.exe.
You can also specify files to compare using command-line arguments for the application. You typically use the application to compare files in a source code control system. For example, use the following command-line syntax to specify file paths to a base file, two modified versions, and the resulting merged file to create:
FileDiffer.exe "C:\My Documents\File1.seq" "C:\My Documents\File2.seq" "C:\My Documents\File3.seq" "C:\My Documents\Merged.seq"
Use the following command-line syntax to launch a dialog box that lists all the command-line arguments you can use for the application.
To launch the File Diff and Merge Utility in a specific TestStand environment, use the following command line argument:
/env <environment path>
where <environment path> is the location of the .tsenv file that defines the environment.