Merge with TortoiseHG - Revision history

Tcplomp: Resize

2012-04-13T12:12:31Z

Resize

← Older revision		Revision as of 12:12, 13 April 2012
Line 33:		Line 33:
	# Hit 'Tool Resolve'		# Hit 'Tool Resolve'
	This will launch LVMerge, and will show the three versions of the VI together with an editable version of the VI to save the actual Merge Result.		This will launch LVMerge, and will show the three versions of the VI together with an editable version of the VI to save the actual Merge Result.
	[[File:HG.LVMerge.png\|~~584px~~\|~~393px~~]]		[[File:HG.LVMerge.png\|876px\|590px]]

	Select Close, and LabVIEW will ask if you want to save the edits (you can easily chose yours or theirs versions).		Select Close, and LabVIEW will ask if you want to save the edits (you can easily chose yours or theirs versions).

Tcplomp: Added MergeResult

2012-04-13T12:11:44Z

Added MergeResult

← Older revision		Revision as of 12:11, 13 April 2012
Line 45:		Line 45:
	Then you will need to add a comment about the merge, and the merge will be committed to Mercurial.		Then you will need to add a comment about the merge, and the merge will be committed to Mercurial.
	Make sure you push the merge to Repository A so that is up to date as well.		Make sure you push the merge to Repository A so that is up to date as well.

			Here's the result of the merge:

			[[File:HG.MergeResult.png]]

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

Tcplomp: Redone layout

2012-04-13T12:06:22Z

Redone layout

← Older revision		Revision as of 12:06, 13 April 2012
Line 10:		Line 10:
	In repository A we change the constant to 'Repository A edited', save and commit the changes.		In repository A we change the constant to 'Repository A edited', save and commit the changes.
	In repository B we perform a Pull (since we cloned from repository A we pull per default from repository A).		In repository B we perform a Pull (since we cloned from repository A we pull per default from repository A).

	[[File:HG.MergeBeforeCommit.png]]		[[File:HG.MergeBeforeCommit.png]]

	This shows the repository B changesets (if you pulled B into A changes 1 and 2 would be switched).		This shows the repository B changesets (if you pulled B into A changes 1 and 2 would be switched).
	Now the merging begins:		Now the merging begins:
	* Rightclick changeset 2 and select 'Merge with local'		* Rightclick changeset 2 and select 'Merge with local'
	The following dialog appears:		The following dialog appears:

	[[File:HG.PreparetoMerge.png]]		[[File:HG.PreparetoMerge.png]]

	Click Next>		Click Next>

	[[File:HG.Merging.png]]		[[File:HG.Merging.png]]

	Click on the underlined word 'Resolved'		Click on the underlined word 'Resolved'

	[[File:HG.Resolve.png]]		[[File:HG.Resolve.png]]

	Make sure you do the following things:		Make sure you do the following things:
	# Select the file you want to merge		# Select the file you want to merge
Line 25:		Line 33:
	# Hit 'Tool Resolve'		# Hit 'Tool Resolve'
	This will launch LVMerge, and will show the three versions of the VI together with an editable version of the VI to save the actual Merge Result.		This will launch LVMerge, and will show the three versions of the VI together with an editable version of the VI to save the actual Merge Result.
	[[File:HG.LVMerge.png]]		[[File:HG.LVMerge.png\|584px\|393px]]

	Select Close, and LabVIEW will ask if you want to save the edits (you can easily chose yours or theirs versions).		Select Close, and LabVIEW will ask if you want to save the edits (you can easily chose yours or theirs versions).
Line 31:		Line 39:
	TortoiseHG will return and the file will have moved into the 'Resolved conflichts' list:		TortoiseHG will return and the file will have moved into the 'Resolved conflichts' list:
	[[File:HG.Resolved.png]]		[[File:HG.Resolved.png]]

	You can edit the resulting file, view the diffferences between the different versions if you want.		You can edit the resulting file, view the diffferences between the different versions if you want.

Line 36:		Line 45:
	Then you will need to add a comment about the merge, and the merge will be committed to Mercurial.		Then you will need to add a comment about the merge, and the merge will be committed to Mercurial.
	Make sure you push the merge to Repository A so that is up to date as well.		Make sure you push the merge to Repository A so that is up to date as well.

	~~[[Category:SCC]]~~

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

Tcplomp: First draft

2012-04-13T11:59:09Z

First draft

New page

[https://tortoisehg.bitbucket.org TortoiseHG] is a client to [[Mercurial]].

This page will show the steps needed to perfrom a visual merge between two branches of one repository.
Prerequisites:
* Working TortoiseHG
* Configured Merge-Tools
* LabVIEW Professional

We start with a Repository A that has a file 'ToMerge' that contains a string constant with the contents 'Repository A'.This file is committed to Mercurial, we clone the repository to Repository B, and edit the string constant to 'Repository B' and commit the edit.
In repository A we change the constant to 'Repository A edited', save and commit the changes.
In repository B we perform a Pull (since we cloned from repository A we pull per default from repository A).
[[File:HG.MergeBeforeCommit.png]]
This shows the repository B changesets (if you pulled B into A changes 1 and 2 would be switched).
Now the merging begins:
* Rightclick changeset 2 and select 'Merge with local'
The following dialog appears:
[[File:HG.PreparetoMerge.png]]
Click Next>
[[File:HG.Merging.png]]
Click on the underlined word 'Resolved'
[[File:HG.Resolve.png]]
Make sure you do the following things:
# Select the file you want to merge
# Select LVMerge as the MergeTool
# Hit 'Tool Resolve'
This will launch LVMerge, and will show the three versions of the VI together with an editable version of the VI to save the actual Merge Result.
[[File:HG.LVMerge.png]]

Select Close, and LabVIEW will ask if you want to save the edits (you can easily chose yours or theirs versions).

TortoiseHG will return and the file will have moved into the 'Resolved conflichts' list:
[[File:HG.Resolved.png]]
You can edit the resulting file, view the diffferences between the different versions if you want.

Use the close button to finalize the resolve conflicts.
Then you will need to add a comment about the merge, and the merge will be committed to Mercurial.
Make sure you push the merge to Repository A so that is up to date as well.

[[Category:SCC]]

[[Category:SCC]]