WUELUG - Würzburg LabVIEW User Group (DE)

cancel
Showing results for 
Search instead for 
Did you mean: 

Set up Fork for GitLab

Solved!
Go to solution

Hi guys!

 

I'm trying to set this up with Sourcetree.  I can invoke the diff tool, but I get this error:

 

justACS_0-1673308113479.png

 

What am I doing wrong?

0 Kudos
Message 21 of 24
(1,479 Views)

Hi Allen,

 

how did you configure SourceTree to use the diff tool?
Which arguments did you set?
In GIT Fork we use these : “$LOCAL” “$REMOTE” -nobdpos -nobdcosm
I was the one that wrote the LabVIEW version of the adapter but haven't tested it with SourceTree.

You can also find the source code in a previous post in this thread.

 

You can also find more info on how to configure the compare in Fab's post :
https://dqmh.org/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/

 

Let me know if you need any more help.

 

Best Regards,

Stefan

0 Kudos
Message 22 of 24
(1,465 Views)

Hi Stefan,

 

Thanks for getting back to me.

 

This is my configuration in Sourcetree:

 

justACS_0-1673370714125.png

 

The diff command path is C:\Program Files (x86)\National Instruments\LVCompare Git Adapter\lvcomparegit.exe.

 

I'll look at Fab's videos, too.

0 Kudos
Message 23 of 24
(1,455 Views)

@StefanLemmens wrote:

Here is the source code for the modified version of the LVCompareGitAdapter.

But I still think Sam's shell script is much nicer since it doesn't require a LabVIEW run-time to be installed.

 

Best Regards,

Stefan


Were you able to get Sam's shell script working in Fork?  As @AlexElb noted it seems you can only select *.exe or *.cmd files for the external tools.

--
Tim Elsey
Certified LabVIEW Architect
0 Kudos
Message 24 of 24
(1,379 Views)