Set up Fork for GitLab

[Ludwig72]

I'm having some trouble setting up Fork for GitLab right now. Since I know that some of you also use Fork, I'm sure I'll find help here.

• The link from Fork to the issues in GitLab is already working very well (Issue Tracker in Repository Settings).
• Thanks to Stefan Lemmens presentation, I also set up a custom command that opens the LabVIEW project directly from Fork. This also works very well.

What unfortunately does not work for me at all is the integration of LVCompare:

• The setup as external diff tool in Fork seems to be no problem.
• The first problem came up with the representation of paths in GitLab.
  screenshot of the error message depending on paths representation in GitLab
  Fortunately, I have already found a solution for this here in the community: LVCompare Adapter for GIT Extensions
• But I still can't compare my LabVIEW files as another error pops up:
  screenshot of the same-name-error
• Now I am unfortunately at my wit's end and could use some help. Did someone get this working?

[joerg.hampel]

Hey Ludwig,

Git Fork recently introduced changes to how external diff tools are supported, see the release notes. Those changes spawned these recent issues, which the Git Fork team are aware of and working on fixing. 

We're also in contact with them to understand if their bug fixes will also solve our problems with LVCompare, or if we'll have to change the way we used to configure Git Fork.

[benjamin-hinrichs]

We were using it until recently, until an update broke it. As a workaround I'm using version 1.66 again. I found it on my machine at this path: C:\Users\User\AppData\Local\Fork\app-1.66.0

We use this fork configuration:

https://dokuwiki.hampel-soft.com/kb/bestpractices/scc/fork

[StefanLemmens]

They just released a new version of Fork 1.69.1.0 which solves this problem.

LVCompare works as before.

Best Regards

Stefan

[StefanLemmens]

Sorry it still doesn't work as expected. Since my class name changed it wasn't comparing files with the same name.

In the past Fork renamed the vi's before comparing them but now it doesn't anymore.

Hopefully this will be fixed in a new version.

Best Regards,

Stefan

[joerg.hampel]

According to my conversation with Dan (Fork's developer), this is not a bug but a feature. So I'm not too confident it will change back in the future.

[Ludwig72]

Unfortunately the app in C:\Users\User\AppData\Local\Fork\app-1.66.0 isn't startable here. Even if I overwrite the original application.

I am sad that the developers propagate this change as a feature. LVCompare is one of source control's strength that I won't miss.

[Ludwig72]

Wohoo - many thanks Joerg for sensitise the developers!

I reinstalled Fork - now on version 1.69.2.0 - and it works!!

new Fork version 1.69.2.0

[StefanLemmens]

Do I have to change something in the settings as well?
I updated but still get the error that LVCompare can't compare 2 files with the same name.

Best Regards,

Stefan

[Ludwig72]

This are my settings:
external diff settings

I use the LVCompare Adapter for GIT Extensions and it works well. (C:\Program Files (x86)\National Instruments\LVCompare Git Adapter\lvcomparegit.exe).