Mercurial - Revision history

Drjdpowell at 20:40, 28 February 2019

2019-02-28T20:40:54Z

← Older revision		Revision as of 20:40, 28 February 2019
Line 31:		Line 31:
	You can now use TortoiseHG to perfrom a merge ([[Merge with TortoiseHG\|How-To]])		You can now use TortoiseHG to perfrom a merge ([[Merge with TortoiseHG\|How-To]])

	~~[[Category:SCC]]~~

	== Setting up LVDiff ==		== Setting up LVDiff ==
Line 138:		Line 138:
	= Mercurial clients =		= Mercurial clients =

	On Windows[[Image:Logo.Windows.png]], Mac[[Image:Logo.Mac.png]] and  Linux [[Image:Logo.Linux.png]], there is a command line client called 'hg'. On windows there is a context menu tool called [http://tortoisehg.bitbucket.~~org~~ TortoiseHG] based on the popular TortoiseSVN and TortoiseCVS tools		On Windows[[Image:Logo.Windows.png]], Mac[[Image:Logo.Mac.png]] and  Linux [[Image:Logo.Linux.png]], there is a command line client called 'hg'. On windows there is a context menu tool called [http://tortoisehg.bitbucket.io TortoiseHG] based on the popular TortoiseSVN and TortoiseCVS tools

	= External Links =		= External Links =
Line 149:		Line 149:
	*[http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]		*[http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]

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

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

2013-05-17T12:46:42Z

Configure

← Older revision		Revision as of 12:46, 17 May 2013
Line 53:		Line 53:
	=== Configure ===		=== Configure ===

	To be able to select lvdiff as the diff tool you need to add ~~teh follwoing~~ settings to the [merge-tools] section of the hgrc configuration file:		To be able to select lvdiff as the diff tool you need to add the following settings to the [merge-tools] section of the hgrc configuration file:
	<pre>lvdiff.diffargs = $child $parent		<pre>lvdiff.diffargs = $child $parent
	lvdiff.executable =C:\Program Files\lvdiff\lvdiff.exe		lvdiff.executable =C:\Program Files\lvdiff\lvdiff.exe

2012-08-23T17:21:16Z

Adjust

← Older revision		Revision as of 17:21, 23 August 2012
Line 49:		Line 49:

	This snippet (the actual code inside lvdiff copy is shown) tests if the filenames are the same and if that's the case it calls a VI called lvdiffcopy, which creates a copy of the file2.		This snippet (the actual code inside lvdiff copy is shown) tests if the filenames are the same and if that's the case it calls a VI called lvdiffcopy, which creates a copy of the file2.
	For LabVIEW 2011 (and up) a patch file is available, use this to replace lvdiff.vi in the lvdiff installer folder[[File:Lvdiff_2011_patch.vi]].		For LabVIEW 2011 (and up) a patch file is available, use this to replace lvdiff.vi in the lvdiff installer folder[[File:Lvdiff_2011_patch.vi\|lvdiff 2011 patch]].

	=== Configure ===		=== Configure ===

2012-08-23T17:19:08Z

Adjust: Added lvdiff patch

← Older revision		Revision as of 17:19, 23 August 2012
Line 49:		Line 49:

	This snippet (the actual code inside lvdiff copy is shown) tests if the filenames are the same and if that's the case it calls a VI called lvdiffcopy, which creates a copy of the file2.		This snippet (the actual code inside lvdiff copy is shown) tests if the filenames are the same and if that's the case it calls a VI called lvdiffcopy, which creates a copy of the file2.
			For LabVIEW 2011 (and up) a patch file is available, use this to replace lvdiff.vi in the lvdiff installer folder[[File:Lvdiff_2011_patch.vi]].

	=== Configure ===		=== Configure ===

2012-04-13T12:08:25Z

Added How To reference

← Older revision		Revision as of 12:08, 13 April 2012
Line 28:		Line 28:
	**.lvlib =LVMerge		**.lvlib =LVMerge
	</pre>		</pre>

			You can now use TortoiseHG to perfrom a merge ([[Merge with TortoiseHG\|How-To]])

			[[Category:SCC]]

	== Setting up LVDiff ==		== Setting up LVDiff ==

2011-09-02T08:39:46Z

Added source URL

← Older revision		Revision as of 08:39, 2 September 2011
Line 94:		Line 94:
	...		...
	</pre>		</pre>
	Next to the mercurial.ini file you create the reference .hgignore file with the contents of your choice.		Next to the mercurial.ini file you create the reference .hgignore file with the contents of your choice ([http://programmer.brettveenstra.com/2010/02/27/mercurial-on-windows-tip-global-ignore-file/ source]).

	= Performing a merge =		= Performing a merge =
Line 142:		Line 142:
	*[http://kiln.stackexchange.com Kiln / Mercurial Knowledge site]		*[http://kiln.stackexchange.com Kiln / Mercurial Knowledge site]
	*[http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]		*[http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]

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

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

2011-09-02T08:37:56Z

Global ignore info

← Older revision		Revision as of 08:37, 2 September 2011
Line 85:		Line 85:
	.aliases$		.aliases$
	</pre>		</pre>

			=== Globally ignoring files ===
			If you're using TortoiseHG you can use a global ignore file, by adding the following in your %profile%\mercurial.ini file:
			<pre>
			[ui]
			...
			ignore = %userprofile%\.hgignore
			...
			</pre>
			Next to the mercurial.ini file you create the reference .hgignore file with the contents of your choice.

	= Performing a merge =		= Performing a merge =
Line 134:		Line 144:

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

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

2011-03-28T09:13:01Z

External Links

← Older revision		Revision as of 09:13, 28 March 2011
Line 131:		Line 131:
	*[http://redline6561.livejournal.com/362393.html Setting Up Mercurial with Apache]		*[http://redline6561.livejournal.com/362393.html Setting Up Mercurial with Apache]
	*[http://kiln.stackexchange.com Kiln / Mercurial Knowledge site]		*[http://kiln.stackexchange.com Kiln / Mercurial Knowledge site]
			*[http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]

			[[Category:SCC]]

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

2011-03-28T09:11:38Z

Download

← Older revision		Revision as of 09:11, 28 March 2011
Line 34:		Line 34:
	=== Download ===		=== Download ===

	First thing is to [http://meta-diff.sourceforge.net/ download] LVDiff, copy the contents of the zip-file to a location where you have writing priviliges (lvdiff uses a local ini file).		First thing is to [http://meta-diff.sourceforge.net/ download] LVDiff, copy the contents of the zip-file to a location where you have writing priviliges (lvdiff uses a local ini file).<br />
			Alternative: Installer from [http://decibel.ni.com/content/groups/mercurial NI Community Mercurial User Group]

	=== Adjust ===		=== Adjust ===

2011-03-24T07:07:39Z

Cosmetic changes.