Sourcetree Diff Tool

Our team is using BitBucket for source code control and the SourceTree app for Windows to interface with our repositories. We've had a couple of small hurdles getting SourceTree to integrate with the LabVIEW diff tool, but here's a solution that's worked for us. (Credit to Paul Lotz on Atlassian's forum, https://community.atlassian.com/t5/Questions/SourceTree-external-diff-path-issue-on-Windows/qaq-p/394740)

First, download these scripts and place them in a local folder:

Sourcetree Diff Tool

For this example, I'm assuming you'll put them in the folder:

C:UsersUser NameAppDataLocalProgramsGITbin

Our team is using BitBucket for source code control and the SourceTree app for Windows to interface with our repositories. We've had a couple of small hurdles getting SourceTree to integrate with the LabVIEW diff tool, but here's a solution that's worked for us. A valuable tool for diagnosing Continuous Integration bugs, Folder Diff also measures how much code must be resolved in pending merge scenarios. Exclude files that are modified, unique, or unchanged. Filter files by name or extension. On its own that is somewhat useful if you have to files in different locations you want to diff. A more common use for a diff is with your source code management system, namely git. You can setup an external diff tool in your.gitconfig with the following setting for VSCode for Windows.

Next, open the options for SourceTree, and go to Tools > Options:

For the diff command, change from 'System Default' to custom and enter:

C:/Users/User Name/AppData/Local/Programs/GIT/bin/_LVCompareWrapper.sh

And for arguments:

'$REMOTE' '$LOCAL'

For the merge command, use:

C:/Users/User Name/AppData/Local/Programs/GIT/bin/_LVMergeWrapper.sh

And for arguments:

'$REMOTE' '$LOCAL'

Mattermost jitsi meet. If you'd like for us to help get your LabVIEW team set up with SourceTree, please let us know by contacting us.

Comments

Sourcetree External Diff Tool Visual Studio Code

Boyd Crow

Sourcetree Diff Tool

November 1st, 2019 at 5:13 pm

I do not understand the backslashes in the path definitions of the .sh file. They seem arbitrary and don't seem to involve 'escaping' spaces. I cannot get SourceTree for Windows to diff two VI versions. If I just select the two versions, then click the VI filename to diff, I get 'No changes in the file, or it is a binary file.' If I click on the Gear icon drop down and select external diff, nothing happens. Open 'Before' and Open 'After' do operate as expected, showing the two different versions of the VI.

I did enable UAC, enable Developer Mode, enable Windows Subsystem for Linux, and install Ubuntu from the Windows Store with suitable reboots before I attempted the changes recommended in this article. Any clues where I can look for log entries, run command manually or otherwise diagnose this problem?

Gareth

June 17th, 2020 at 4:31 am

Git Diff Tool Gui

Hi Marty,

Sourcetree Diff Tool

This looks promising, and I would like to set it up! However, your wrappers are in your google drive trash. Is there an updated version of this?

Sourcetree Diff Tool Online

Tanner Ellsworth

June 30th, 2020 at 5:57 pm

I zipped the compare and merge scripts that I am currently using, uploaded them and updated the link, so you should be able to download them now.

Add new comment