lvmerge doesn't work

[dsavir]

Hi all,

We're trying to start working with Tortoise SVN. I entered all the correct stuff into the SVN settings as per here: http://expressionflow.com/2007/08/28/using-new-labview-merge-tool-lvmerge-with-tortoisesvn/. (I tried both versions of the command to call lvmerge - in the post and in the comments).

When I have a conflict, I go to tortoiseSVN->edit conflicts. LVMerge runs, stops running, exits. No errors. On the other hand, it does absolutely nothing. Does anyone have any idea what to do?

Also, I tried to get it to work with GIT, there it wouldn't even open LVMerge. Any ideas would be welcome.

Thanks,

Danielle

[Ben_S]

dsavir,

Hello!

Have you see the KnowledgeBase Article, "How do I use Subversion (SVN) and TortoiseSVN for source code controlling LabVIEW projects?", the LabVIEW Help File, "Configuring Source Control with LVMerge.exe", the discussion forum, "Tortoise SVN and LabVIEW linkage", or the following document, "Introduction to Source Code Control using TortoiseSVN". These documents look helpful and I hope they are able to provide you with some help.

[dsavir]

Hi,

Yes, I read them. They don't use lvmerge at all and don't use any merging option instead - they just do without. The only place that explains how to use lvmerge is the url I already put and the labview wiki. I tried them all and it still doesn't work. Any ideas?

Thanks,

Danielle

[Ben_S]

dsavir,

What happens when you use LVmerge from LabVIEW on the VIs that are giving you trouble in Tortoise SVN?

[Michael Ludwig · Accepted solution]

I use CVS and TortoiseCVS, so this might be slightly different, but as far as i know you cannot really merge LV vis because they are actually compiled, that is binary files.

My TortoiseCVS does claim it is merging files, but actually, as far as i know, it is only saving the latest version of the subvi, not merging two bits of code. Since LV is constantly recompiling vis, CVS needs to do a lot of merging, but only between two vis that are not "really" different. 

If you want to merge two vis with different code (front or back panels) you will need to merge them in LV and then commit the newly merged vi. Even merging text (config) files under CVS is not elegant, and usually does not result in working files. Any real merge (still) requires human intervention, sadly.