Set up differencing capabilities - Revision history

Bryan: /* Using LVCompare.exe and TortoiseSVN */

2023-09-19T13:35:18Z

Using LVCompare.exe and TortoiseSVN

← Older revision		Revision as of 13:35, 19 September 2023
Line 51:		Line 51:
	<blockquote>		<blockquote>
	"C:\'''Program Files (x86)'''\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine		"C:\'''Program Files (x86)'''\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine
	</blockquote		</blockquote>
	(from [http://zone.ni.com/devzone/cda/tut/p/id/9407] Command-Line Graphical Differencing of VIs)		(from [http://zone.ni.com/devzone/cda/tut/p/id/9407] Command-Line Graphical Differencing of VIs)

Bryan: /* Using LVCompare.exe and TortoiseSVN */

2023-09-19T13:34:33Z

Using LVCompare.exe and TortoiseSVN

← Older revision		Revision as of 13:34, 19 September 2023
Line 48:		Line 48:
	"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine		"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine
	</blockquote>		</blockquote>
			''Note:'' If you're using 32-bit LabVIEW on a 64-bit Windows OS, the path would be:
			<blockquote>
			"C:\'''Program Files (x86)'''\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine
			</blockquote
	(from [http://zone.ni.com/devzone/cda/tut/p/id/9407] Command-Line Graphical Differencing of VIs)		(from [http://zone.ni.com/devzone/cda/tut/p/id/9407] Command-Line Graphical Differencing of VIs)

SamTaggart: I added a link to my easy setup for Git.

2023-02-13T21:17:31Z

I added a link to my easy setup for Git.

← Older revision		Revision as of 21:17, 13 February 2023
Line 1:		Line 1:
			== Easy Setup For Git ==
			The easiest way to setup LVCompare and LVMerge for use with Git is to copy/paste the following into Git Bash

			<nowiki>cd && git clone https://gitlab.com/sas-blog/LVCompare-Merge-Setup.git && cd LVCompare-Merge-Setup && ./setupLVTools.sh</nowiki>

			This will clone a repo and run a shell script to set everything up. You can read more about it here:
			https://blog.sasworkshops.com/the-easiest-way-to-setup-lvcompare-and-lvmerge/

			After that, you can use the difftool command in Git Bash to view diffs or use your favorite Git GUI.




	There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.		There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.

ChrisCilino at 17:08, 29 July 2019

2019-07-29T17:08:53Z

← Older revision		Revision as of 17:08, 29 July 2019
Line 59:		Line 59:
	== Using SourceTree and LVDiff for VIs ==		== Using SourceTree and LVDiff for VIs ==
	You can invoke LVCompare.exe from Atlassian SourceTree by using the application found here: [https://github.com/smithed/vicompare VI Compare].		You can invoke LVCompare.exe from Atlassian SourceTree by using the application found here: [https://github.com/smithed/vicompare VI Compare].
			Set up SourceTree using the steps below.
	{\| class="wikitable"		{\| class="wikitable"
	\|-		\|-
Line 70:		Line 71:
	[[File:2019-07-29 11h46 08.png]]		[[File:2019-07-29 11h46 08.png]]
	\|}		\|}

	~~[[Category:SCC]]~~
	~~[[Category:SVN]]~~
	~~[[Category:SCC]]~~
	~~[[Category:SVN]]~~

	[[Category:SCC]]		[[Category:SCC]]
	[[Category:SVN]]		[[Category:SVN]]

ChrisCilino at 16:54, 29 July 2019

2019-07-29T16:54:33Z

← Older revision		Revision as of 16:54, 29 July 2019
Line 59:		Line 59:
	== Using SourceTree and LVDiff for VIs ==		== Using SourceTree and LVDiff for VIs ==
	You can invoke LVCompare.exe from Atlassian SourceTree by using the application found here: [https://github.com/smithed/vicompare VI Compare].		You can invoke LVCompare.exe from Atlassian SourceTree by using the application found here: [https://github.com/smithed/vicompare VI Compare].
	To ~~set up SourceTree do~~ the ~~following:~~		{\| class="wikitable"
	[[File:~~Sourcetree Demo~~.~~gif~~\|~~thumb~~]]		\|-
			\| Go To Tools>>Options \|\|
			[[File:Tools,options.png]]
			\|-
			\| Select "Diff". Then Select "Custom" for External Diff Tool and Merge tool \|\|
			[[File:2019-07-29 11h45 51.png]]
			\|-
			\| Navigate to the installed executables. Specify <"$LOCAL" "$REMOTE"> for Diff Command Arguments and <"$BASE" "$REMOTE" "$LOCAL" "$MERGED"> for Merge Command Arguments \|\|
			[[File:2019-07-29 11h46 08.png]]
			\|}

			[[Category:SCC]]
			[[Category:SVN]]
			[[Category:SCC]]
			[[Category:SVN]]

	[[Category:SCC]]		[[Category:SCC]]
	[[Category:SVN]]		[[Category:SVN]]

ChrisCilino at 16:15, 29 July 2019

2019-07-29T16:15:52Z

← Older revision		Revision as of 16:15, 29 July 2019
Line 2:		Line 2:

	== LVCompare.exe National Instruments Documentation ==		== LVCompare.exe National Instruments Documentation ==
	http://zone.ni.com/reference/en-XX/help/371361R-01/lvhowto/configlvcomp_thirdparty/		This documentation describes the options you can pass to LVCompare.exe. For example, you can instruct LVCompare.exe to ignore changes in the position of front panel objects by pass in "-nofppos". For the full set of documentation please refer to the link below:
			[http://zone.ni.com/reference/en-XX/help/371361R-01/lvhowto/configlvcomp_thirdparty/ LVCompare.exe from National Instruments]

	== Using LVCompare.exe and svn CLI ==		== Using LVCompare.exe and svn CLI ==
Line 58:		Line 58:

	== Using SourceTree and LVDiff for VIs ==		== Using SourceTree and LVDiff for VIs ==
	~~#Follow~~ the ~~directions at~~ https://github.com/smithed/vicompare ~~to build and install~~ the ~~executable responsible for invoking lvcompare.exe~~.		You can invoke LVCompare.exe from Atlassian SourceTree by using the application found here: [https://github.com/smithed/vicompare VI Compare].
			To set up SourceTree do the following:
			[[File:Sourcetree Demo.gif\|thumb]]

	[[Category:SCC]]		[[Category:SCC]]
	[[Category:SVN]]		[[Category:SVN]]

ChrisCilino at 23:23, 26 July 2019

2019-07-26T23:23:42Z

← Older revision		Revision as of 23:23, 26 July 2019
Line 1:		Line 1:
	There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.		There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.

			== LVCompare.exe National Instruments Documentation ==
			http://zone.ni.com/reference/en-XX/help/371361R-01/lvhowto/configlvcomp_thirdparty/


	== Using LVCompare.exe and svn CLI ==		== Using LVCompare.exe and svn CLI ==
	From the command line, subversion cannot normally compare binary files such as vis. The svn diff command has a switch --diff-cmd to allow an external differencing engine to be used. This will be leveraged to used LVComare to operate on vis.		From the command line, subversion cannot normally compare binary files such as vis. The svn diff command has a switch --diff-cmd to allow an external differencing engine to be used. This will be leveraged to used LVComare to operate on vis.

ChrisCilino: adding help for sourcetree

2019-07-26T23:18:44Z

adding help for sourcetree

← Older revision		Revision as of 23:18, 26 July 2019
Line 51:		Line 51:

	To compare a file with the previous version in the repository right-click on the file in Windows explorer and select "TortoiseSVN...Diff with previous version".		To compare a file with the previous version in the repository right-click on the file in Windows explorer and select "TortoiseSVN...Diff with previous version".

			== Using SourceTree and LVDiff for VIs ==
			#Follow the directions at https://github.com/smithed/vicompare to build and install the executable responsible for invoking lvcompare.exe.

	[[Category:SCC]]		[[Category:SCC]]
	[[Category:SVN]]		[[Category:SVN]]

Shaunhayward at 01:59, 29 August 2009

2009-08-29T01:59:02Z

← Older revision		Revision as of 01:59, 29 August 2009
Line 30:		Line 30:
	"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine		"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine
	</blockquote>		</blockquote>
			(from [http://zone.ni.com/devzone/cda/tut/p/id/9407] Command-Line Graphical Differencing of VIs)

	== Using TortoiseSVN and LVDiff for VIs ==		== Using TortoiseSVN and LVDiff for VIs ==

Shaunhayward at 01:56, 29 August 2009

2009-08-29T01:56:06Z

← Older revision		Revision as of 01:56, 29 August 2009
Line 1:		Line 1:
	There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.		There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.
	== Using LVCompare.exe and svn CLI ==		== Using LVCompare.exe and svn CLI ==
	From the command line, subversion cannot normally compare binary files such as vis. The svn diff command has a switch --diff-cmd to allow an external differencing engine to be used. This will be leveraged to used LVComare to operate on vis.		From the command line, subversion cannot normally compare binary files such as vis. The svn diff command has a switch --diff-cmd to allow an external differencing engine to be used. This will be leveraged to used LVComare to operate on vis.

	To use LVCompare.exe with subversion in the command line, first add "C:\Program Files\National Instruments\Shared\LabVIEW Compare" to your system PATH variable (this allows the command prompt to find LVcompare.exe).		To use LVCompare.exe with subversion in the command line, first add "C:\Program Files\National Instruments\Shared\LabVIEW Compare" to your system PATH variable (this allows the command prompt to find LVcompare.exe).

	The output of the diff command is quite complicated (from [http://subversion.tigris.org/faq.html#diff-cmd] subversion FAQ):		The output of the diff command is quite complicated (from [http://subversion.tigris.org/faq.html#diff-cmd] subversion FAQ):
Line 24:		Line 24:

	IMPORTANT: As stated in the FAQ, subversion does not expect diff to make any changes, so make sure not to save the text-base vi.		IMPORTANT: As stated in the FAQ, subversion does not expect diff to make any changes, so make sure not to save the text-base vi.

			== Using LVCompare.exe and TortoiseSVN ==
			For users of the TortoiseSVN client and LabVIEW 2009, it is also possible extend TortoiseSVN's built-in differencing functionality to allow VIs to be compared from a simple Windows Explorer right-click menu using LVCompare.exe. This can be achieved by adding an entry for .VI files to the "Advanced" list of TortoiseSVN's Diff settings with the following syntax<ref>http://zone.ni.com/devzone/cda/tut/p/id/9407</ref>:
			<blockquote>
			"C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine
			</blockquote>

	== Using TortoiseSVN and LVDiff for VIs ==		== Using TortoiseSVN and LVDiff for VIs ==