Version Control

[Nibbles]

Originally Posted by Alan Anderson

I believe you are mistaken about the amount of effort it would take. Imagine trying to resolve differences between simple .hex files for the IFI control system.

VI's should be simpler then a compiled file (why would you version a compiled file anyways?) because you can inspect and edit it directly, but, yeah, it turns out it is quite a bit of effort. I tested it out, merging VI's I am having a hard time with, having the native diffing tools would really help (otherwise it would be a simple edit to the repo config file specifying the path of the tools). I am also unsure if the VI may be formatted differently when moved between computers or versions of LabView. It appeared simply opening up and closing a project changed it, but Git had no problem merging this (it should be that simple for SVN too, it has a single parent). Merging different changes it got caught up with, and I can imagine this happening all throughout the build season and having to repeatedly visually inspect both versions and manually merge them by hand. Best case it could be a 15 minute task each time, still bad news. It looks like there is no good versioning system for LabView projects available to teams...