Configuring Source Control with LVMerge.exe

LabVIEW 2018 Help


Edition Date: March 2018
Part Number: 371361R-01
View Product Info

DOWNLOAD (Windows Only)


LabVIEW 2016 Help
LabVIEW 2017 Help
LabVIEW 2018 Help
LabVIEW 2019 Help
LabVIEW 2020 Help

You can configure a third-party source control provider to use LVMerge.exe as the default merge application. LVMerge.exe is equivalent to the Merge VIs dialog box. Use LVMerge.exe to automatically or interactively resolve differences between an original VI and two revisions of the original VI.

Note  LVMerge.exe is available only with the LabVIEW Professional Development System.

Complete the following steps to configure a third-party source control provider to use LVMerge.exe as the default merge application.

  1. Make sure the computer on which you are running LabVIEW also includes a third-party source control provider, which you should install and configure to meet the requirements of the current software project. Consult your source control administrator for additional assistance.
  2. Direct the source control provider to LVMerge.exe. LabVIEW installs LVMerge.exe in different locations depending on the platform. The following directories are default installation locations for LVMerge.exe, but may vary depending on the configuration of the local machine:
    • (Windows) C:\Program Files\National Instruments\Shared\LabVIEW Merge\LVMerge.exe
    • (macOS) /Library/Application Support/National Instruments/LabVIEW Merge/LVMerge.app/Contents/MacOS/LVMerge
    • (Linux) /usr/local/bin/LVMerge
  3. (Optional) Configure any arguments that LVMerge.exe needs in the third-party source control provider. The following table lists available arguments.
    1 (optional) Specifies path to the version of LabVIEW to use for the merge operation. If you do not supply this argument, the Merge VIs dialog box uses the following versions of LabVIEW by default:
    • (Windows) Currently registered LabVIEW
    • (macOS) Latest installed version of LabVIEW
    • (Linux) Last installed LabVIEW
    2 Absolute path to a copy of the VI from where you checked it out (Base VI).
    3 Absolute path to a copy of the latest revision of the VI in source control (Their VI).
    4 Absolute path to the VI you edited (Your VI).
    5 Absolute path to which to save the merged VI.

For example, to specify the version of LabVIEW for the merge operation is LabVIEW 8.6, use the following command line:

LVMerge.exe "C:\Program Files\National Instruments\LabVIEW 8.6\LabVIEW.exe" c:\files\base.vi c:\files\theirs.vi c:\files\yours.vi c:\files\merged.vi.

In the command line, the first path is optional and leads to the location of the LabVIEW executable.

  1. (Optional) Complete any remaining steps to configure the third-party source control provider. Consult the documentation for your third-party source control provider for more information.

WAS THIS ARTICLE HELPFUL?

Not Helpful