Quote:
Originally Posted by Nibbles
The merge.labview.recursive was my fault. What difference does it make being set vs. not set? Maybe LVMerge is getting executed, just badly.
|
It doesn't appear to, though I'll try doing it directly from the command line to see if LVMerge is doing anything at all...
Quote:
Originally Posted by Nibbles
Try prepending "echo" to the driver too, to see exactly what it is calling. It should be giving LVMerge a set of three temporary files to evaluate then write back. Maybe you want to try it by hand too, check the NI documents I linked to.
|
If I do a echo for the diff, I get two files (first the current, then I guess the previous commit) and then some sort of number (timestamp?).
Echo'ing the merge, does have 4 files, though their names aren't really specific (.merge_file_a03232).
Quote:
Originally Posted by Nibbles
Google suggests that no one has ever tried using Git and LabView together before, or, everyone else has just gotten it right the first time.  In any event it doesn't appear to be a heavily used feature of LabVIEW. |
Hehe. I guess everyone use Perforce or nothing. :\
In the absence, of LVCompare, I've almost got lvdiff working, though the LabVIEW vi they use is currently yelling at me for missing some file (though it is very vague on that as well).
Looking a Perforce, seems you can get a free 2-user copy. Exciting. *sigh* Guess it just wasn't meant to be?
-Tanner