Git User Group

cancel
Showing results for 
Search instead for 
Did you mean: 

Integrating LVCompare & LvMerge with Fork (the Git Client) ?

Solved!
Go to solution

Its a nice git Client. But I dont get the Merge Tool and the external Diff Tool to open LVCompare.

 

So this doasnt work:

Lichtenheld_0-1582271655288.png

 

Help is appreciated!

 

0 Kudos
Message 1 of 5
(5,793 Views)

I'm just fighting the same issues but with TortoiseGIT/Sourcetree and still LV2016. After days of digging the forums here and elsewhere and after contact with NI support there was success.

 

I found that the arguments made the difference. Path formatting was not as sensible as many old forum entries suggest. It seems there was some programming going on in the tools since.
Try first without any -nobdcosm arguments and alike and add them at the begin of your arguments list after it works without them. Play with the position.

Use 2 paths for compare and 4 paths for merge. Don't expect helpful error messages.

 

Without knowing Fork I'm wondering wheter the comma in your argument list is correct. I'd try without.

 

It's disappointing that NI does not provide proper guides for setting up at least the most widespread SCC-solutions. Even just finding the arguments for LVCompare and LVMerge (I saw a documentation once but lost the page link) is a Google adventure.

Not to mention IDE-integration.
Hey NI: It's not as if SCC is a hype that will be forgotten next year...

Message 2 of 5
(5,779 Views)
Solution
Accepted by topic author M.Lichtenheld

Here's a screenshot of how our good friend benjamin-hinrichs configured Git Fork:

d38a801a-0ce1-45c5-8beb-e9d3d57617cf.jpg

 

 And if you, like me, still prefer Git Tower (or other clients that do not offer native support for absolute paths in arguments) over Git Fork, you can look into this link to make it work:

https://community.atlassian.com/t5/Sourcetree-questions/SourceTree-external-diff-path-issue-on-Windo...

Bildschirmfoto 2020-02-21 um 14.16.45.png

No, I didn't configure LVMerge, because no, we don't merge VIs.

 

PS: For reference, there's an elaborate blog post on delacor.com talking about LVCompare and LVMerge in general:

http://delacor.com/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/




DSH Pragmatic Software Development Workshops (Fab, Steve, Brian and me)
Release Automation Tools for LabVIEW (CI/CD integration with LabVIEW)
HSE Discord Server (Discuss our free and commercial tools and services)
DQMH® (The Future of Team-Based LabVIEW Development)


Message 3 of 5
(5,753 Views)

To get the arguments for LVCompare, simply run the executable without any arguments (double click on it) and it will pop up with its arguments.  Unfortunately, the same doesn't occur for LVMerge.

 

I've got Bash script wrappers for both in my setup and LVMerge does launch successfully but I've never actually merged anything (and hope I never actually need to do so).

0 Kudos
Message 4 of 5
(5,740 Views)

Thanks to all.

 

Here´s what works for me:

Lichtenheld_0-1582529209188.png

 

 

For the lazy:

Diff Tool Path: 

C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe


Arguments:

"$LOCAL" "$REMOTE" -nobdcosm -nobdpos

 

 

 

Message 5 of 5
(5,693 Views)