Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,457,719
Community Members
 
Community Events
176
Community Groups

Using sourcetree with an external diffviewer for labview

I've seen examples on how to set up tortoisegit with labview's lvcompare.exe, but I don't see anywhere I can do something similar on sourcetree/

For those that maybe aren't familiar, labview is a graphical programming language that doesn't work too well with traditional git viewers.

2 answers

Have a look at this solution from NI.

https://github.com/smithed/vicompare

This makes sure that the output from the variables for $LOCAL, $REMOTE etc are changed over to the Absolute paths that are required for LV Merge and LV Compare.

I have been using this successfully.  Unfortunately its not always smooth, due to LabVIEW Compare wanting to load all subVIs in memory based on the location of the top level VI that is cloned off - thus the VIs can not be found where "expected".

 

Encouraging news from NI with NXG this won't be a problem.  The VI is going to XML base from binary (still not human readable) and Compare won't require loading the VIs on the block diagram, as we're just doing a visual compare.  Git will deal with the difference tracking more elegantly.

NowXG just needs to get up to speed...

0 votes
Timothy Rising Star Aug 28, 2013

I'm assuming that you are trying to use an external diff tool with SourceTree? Have you seen this (https://answers.atlassian.com/questions/169145/sourcetree-external-diff-tool)?

It looks like ithe link is broken and I can't find it by digging... but yes that is exactly what I am trying to do.

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events