I am currently learning how to use TortoiseSVN with my project in LabView 2009. At the moment I am not using any of the toolkits available for integrating TortoiseSVN with LabView, but I may in the future. It appears that LVMerge has issues with working with VIs that are on an RT target in the LabView project. Here is my process:
1. Perform an SVN Update to get the latest version of my code from the server
2. Open the LabView project
3. Make a small modification to a VI in the project that is on my RT target
4. Save the change and commit it to SVN.
5. Update SVN to the version of my code prior to the commit I just did.
6. Make a small, but different, modification to the same VI I did before.
7. Save the change and perform an SVN Update.
This causes a conflict, which is what I was trying to do. I should note here that TortoiseSVN is calling LVcompare and LVmerge using the method escribed on this page:
LVCompare command -
"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %mine %base -nobdcosm -nobdpos
LVMerge command -
"C:\Program Files\National Instruments\Shared\LabVIEW Merge\LVMerge.exe" %base %mine %theirs %merged
Now I do an SVN Commit, which pops up a dialog where I can double click on the conflicted VI and merge it. When I do so, LVmerge runs but does not behave properly. It either hangs and I have to end its process, or it crashes LabView. It does not behave this way if I use it to resolve conflicts on VIs that are on the PC rather than the RT. Is there a way I can use LVMerge on VIs on the RT target without this behavior? Do any of the toolkits for integrating TortoiseSVN and LabView work around this issue? I intend to try one of the toolkits soon to find out.