#SOURCETREE DIFF TOOL CODE#
#SOURCETREE DIFF TOOL PASSWORD#
#SOURCETREE DIFF TOOL FREE#

LVCompare was called with incorrect parameters. Perhaps incorrect parameters are causing this problem as well. When I try to resolve a merge conflict using the external merge tool, labview opens with the error seen in the attahced picture. Is there somewhere in sourcetree I can set the exact command that is executed, or how can I fix this problem? Labview compare then launches with the error message seen below. In the 'file status' tab I hightlight the file at hit ctrl+d to launch the external diff tool. I have made a change to a file called 'xxx.vi'. Thanks for your reply! It seems to be more right now. Its now pushed to my github if you want to take a look and give it a try. I gave it a quick test to make sure the basics still worked, but I probably won't get around to doing a more complete test for a while. I just spent a little while shoving together a few small fixes to the above.

#SOURCETREE DIFF TOOL CODE#

So.while I exposed those flags as optional parameters on the 'black box' diff and merge methods, I never implemented them as part of the parsing, and the code (wrongly) treated every flag left over as a path it needed to fix. One possible reason I did this is that I used some private methods to make sure each VI gets its own application context to avoid issues where the two VIs being diff'd have the exact same namespaced name - I don't think git does this, but maybe mercurial did? Anyway, point is I just called the labview diff and merge methods directly, rather than fixing the paths and calling into the exe. It should be easy to hack those pieces together if you want it to work that way. Yeah, at the time I didn't want to have the exe call the exe for some reason, but I can't remember exactly why. best case I fix it, worst case other people can know about it.

#SOURCETREE DIFF TOOL FREE#

If you do see a specific issue in practice, feel free to put an issue on the repo.

Once 2018 is further behind us, it would be worth bumping the code to use the new command line interface.

I thought about maybe using this to simplify things rather than trying to use VI server.

Or I could be making this up entirely, its been a while

If you use different labview versions simultaneously I think there are ways it can get confused.as I recall it looks to see if 'LabVIEW.exe' is open and uses VI server if it is, but if the port is different it wont work.

If you are a mixed-use person, there should be a way to assign this to only be called for VIs, I believe.but honestly I find sourcetree good enough for the small bits of python or whatever that I edit.

#SOURCETREE DIFF TOOL PASSWORD#

The only part that is password protected is the core diff/merge function call. Check the docs folder (esp the image) for what goes where.

The code was written with the goal in mind of being relatively easy to edit.

You can specify a version you want to use, I think with -lv, in other words add '-lv 2017' to the args.

I admit I had and still have 0 knowledge of the finer points of bash scripts, let alone bash scripts running in the git terminal on windows. I tried using it at the time (and even branched it) but got frustrated, hence my version, but it looks like someone had spent some time contributing to it a few years ago - so maybe my frustrations were resolved. Thats also how that doc on the reference design portal came about.Īnother possibly useful script you may not be aware of is I mentioned to ryan that I was making this a while back when I was trying to push for github use for my old group. Hi all, I'm glad that tool is working well for you. I found another thread that said it first looks in the path defined by the HOME environment variable I didn't have one, but I created it, and that still didn't help. So I don't think Sourcetree knows where my.

And if I run the command from the log above through the terminal, MINGW64 doesn't give me the error message. But if I change the tool from within Sourcetree, my. I have 'Allow Sourcetree to modify your global Git and Mercurial config files' checked. I've seen this topic multiple times on here, but none of the solutions seem to be applicable to my situation. 'Output': 'Unknown merge tool sourcetree fatal: external diff died, stopping at ble/Source/hal_vault.c ' 'CallerContext': 'GetExternalDiffProcess', When I try to run one, the Process Log says this: So I updated to 3.1.3 for Windows, and while the Tools->Options->Diff menu does remember what I put in there now, it doesn't do anything anymore. I found a post here that said that was a known issue, and it was fixed in the latest version. I was previously using an older version of Sourcetree, and I'd have to keep setting up the external diff tool on every restart of the program.

Sourcetree diff tool