Comments on: Using new LabVIEW Merge Tool LVMerge With TortoiseSVN

By: ekerry

ekerry — Sun, 07 Mar 2010 19:26:05 +0000

Great article – I’m a big Subversion fan. I thought you all might want to know about some recent improvements to our interface with TortoiseSVN. In LabVIEW 2009, we extended the compare tool so that it can be called as an executable – to set it up, just put this in for vi and ctl extensions:

“C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe” %mine %base

Also, I highly recommend adding ‘skipSVNFolders=true’ to the labview.ini file. We added this option in 2009 (will be on by default in 2010) so that LabVIEW will not attempt to mass-compile the contents of hidden directories. It also addresses a few other issues with auto-populating folders and the search feature.

More info can be found here: http://zone.ni.com/devzone/cda/tut/p/id/9407

By: Subversion hosting - a simple path to LabVIEW source code control - ExpressionFlow

Wed, 17 Sep 2008 09:53:45 +0000

[...] Comments Franz on Using new LabVIEW Merge Tool LVMerge With TortoiseSVNRolf Kalbermatter on External Code in LabVIEW, Part2: Comparison between shared libraries and [...]

By: Franz

Franz — Fri, 15 Aug 2008 10:46:30 +0000

Hi Arranny, I get the same error as you, i.e. I can’t use the ‘Conflict resolved…’ feature of TortoiseSVN.

As a workaround I (after merging) manually deleted the files ‘test.vi.r8′ and ‘test.vi.r9′. Then the menu entry ‘Conflict resolved…’ is not available any more, but I can do a normal ‘SVN Commit’ and all seems to be fine.
I don’t know if there are side effects, however.
(BTW, I use Tortoise 1.5.2, while Tomi Maila’s originally posted his recipe when version 1.5.x was not out yet)

By: Arranny

Arranny — Fri, 08 Aug 2008 22:15:06 +0000

LVMerge works pretty well, but somehow after I finish editing my conflicts, I cannot set my file to resolved using tortoise. I get the following error:
Error: An unknown error occurred while accessing C:\Development\TestRepository\RandomNumberDisplay.vi.

Anyone else experience the same? For non-labview files, resolving conflicts is fine.

By: Dannyt

Dannyt — Thu, 17 Jul 2008 12:33:39 +0000

Hi,

If you were programming in LabVIEW 8.2.1 but had LabVIEW 8.5 installed on your machine would the LVMerge.exe still work in that situation, or do you have to actually be working in LabVIEW 8.5 ?

just curious really

cheers

Danny

By: Michael

Michael — Fri, 28 Mar 2008 21:32:29 +0000

I get the following after resolving conflicts:

Error: An unknown error occurred while accessing H:\SVN Sandbox2\asdf.vi.
Resolved: H:\SVN Sandbox2\asdf.vi

Anyone else get the same? The conflicts are resolved, I’m able to Commit, everything is fine, I’m just curious if that error means anything and if others see the same.

By: Jody Koplo

Jody Koplo — Thu, 24 Jan 2008 23:20:37 +0000

Used the command line that was suggested by Jaegen in comment #3. Works amazingly well. I am impressed.

By: Richard Herzog

Richard Herzog — Thu, 17 Jan 2008 11:28:04 +0000

Thanks for your help which allowed me to install LVmerge & LVdiff in TortoiseSVN.
I have a basic query: everytime a Vi is moved location (like in checking out to a new user/location), it is recompiled and marked “modified”, hence every checkout can potentially generate a new revision?! How to avoid this very confusing LabView “feature”.

By: Tomi Maila

Tomi Maila — Mon, 29 Oct 2007 19:44:23 +0000

“C:\Program Files\National Instruments\Shared\LabVIEW Merge\LVMerge.exe” “C:\Program Files\National Instruments\LabVIEW 8.5\LabVIEW.exe” %base %theirs %mine %merged

The above command line works for me. I guess the blog editor has changed the double quotes I used into some unicode characters that are not actually ascii versions of the double quotes.

By: Tim Streeter

Tim Streeter — Wed, 26 Sep 2007 21:19:01 +0000

If you want to do a LabVIEW compare you should check out MetaDiff.

http://meta-diff.sourceforge.net/

I have used the LVdiff tool successfully with SVN.

When NI finally send us our copy of LV8.5 I will finally have a complete suite of tools that work with subversion.