honoka

I no longer use LabVIEW, and I am not a programmer anymore.

Thus, I want to delete this account.

Is it possible to delete my account?

It turned out that tortoiseGit's diff and merge tools were separate from git.

I succeeded in configuring tortoiseGit with LVMerge and LVDiff.

Although I haven't really succeeded in configuring git with LVMerge and LVDiff, I think it would be better to configure difftool and mergetool than low level diff and merge drivers for LabVIEW.

There are two reasons.

1) If I set up a low level diff driver for LVDiff, git extensions would launch LVDiff whenever I select a file in git extension's commit window, which is very annoying.

2) If I set up a low level merge driver for LVDiff, every "git merge" operation might launch LVMerge for every file that needs merging, which again can be annoying.

Since neither tortoiseGit nor git extensions doesn't use "git difftool" or "git mergetool", setting difftool and mergetool along with tortoiseGit for LabVIEW would make it easier to use both tortoiseGit and git extensions.

I've search the internet, but it seems difficult.

Can anybody refer me to a proper URL?

If you are looking into a project management tool there are options out there that cover these items. Hooking into these from within LabVIEW is most of the time an issue. I have no experience with that.

However most of the SCC's have management hooks that you can use to tell the project management tool what happened (see my post on integrating Rhodecode with Mantis).

Ton

As far as I know, mantis is not a project management tool but a mere bug tracking system.

I'm relying on HG. Have never really worked with Git since I'm happy with HG.

Since you don't have the time to dive into the SCC system you want to use I would advice you to go with HG, it's just harder to mess up.

I haven't had stability issues with HG (Workbench).

What are you going to setup as a server? If you have the time (approx. half a day), setting up rhodecode on a linux server is a good idea. It gives you user management and a web-interface beyond the shipped webserver of HG.

Ton

What about "TortoiseHg doesn’t support branching or merging. All of this will have to be done from the command line." and "The built-in server can only serve one repo at a time." on https://decibel.ni.c...curial-thoughts ?

Does TortoiseHg now support branching and merging on its GUI?

Does the built-in server really serve one repo at a time?

Tortoise SVN seems to be the most stable, but I prefer to use a distributed SCC system.

Since my boss is impatient and impetuous(probably ADHD because his son has ADHD), I think I can't afford to fiddle with SCC for more than a week.

I read all those threads about Tortoise HG in this forum, but I'd like to give TortoiseGit a shot.

The choice doesn't entirely depend on my preference but would have to be the more stable one.

Which one is more stable?

Should I just stick to Tortoise SVN for stability?