External Diff/Merge Tool Arguments

AlanYu October 18, 2017

Hi, I'm using SourceTree 2.3.1.0.

I use external diff/merge(LVCompare, LVMerge) tool to work with my LabVIEW files. These external tools need the absolute path of the files I want to compare/merge.

But somehow, I think the arguments I use ($PWD $BASE $REMOTE $LOCAL $MERGED) doesn't output correct absolute path to my external tools. They just output relative path.

I remember at previous version(maybe at 1.x.x.x), these work fine. I've launch external tools perfectly before.

 

Please help, thanks!

Capture.PNG

3 answers

1 vote
UPWT December 13, 2018

Alan,

Have a look at this solution from NI.

https://github.com/smithed/vicompare

Marty Vowles December 13, 2018

This seems great, thanks for the update!

Like UPWT likes this
0 votes
Marty Vowles May 7, 2018

I'm also having problems with recent versions of SourceTree. I massaged some scripts that worked from Q1 2017 versions through Q4 2017, but I haven't been able to use the external diff well since. The way I had it working is at our website, but that only works for diffs in the log window now, not for diffs from the file status display. Seems to have changed post 2.4ish.

0 votes
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
October 20, 2017

Hi

I can't honestly remember if we ever changed that but we will look at it.

Can you add the configuration you use to https://jira.atlassian.com/browse/SRCTREEWIN-8078

Thanks

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events