MergingBranches - Revision history

Ndp: /* Conflicts */

2014-02-14T21:14:13Z

Conflicts

← Older revision		Revision as of 21:14, 14 February 2014
Line 107:		Line 107:

	Dealing with conflicts in the code:		Dealing with conflicts in the code:
	~~<font size="2">~~		<source lang="bash">
	<source lang="sh">
	/ set the structure values to create the FreeForm DB/		/ set the structure values to create the FreeForm DB/
	SetUps->user.is_stdin_redirected = 0;		SetUps->user.is_stdin_redirected = 0;
Line 136:		Line 135:
	#endif		#endif
	</source>		</source>
	~~</font>~~

	In this case the diff doesn't completely make sense, but the first part (''.working'') is from the working copy and the second part is from the right hand URL given to merge, so it's the 'other' code. Aa I said above, you sometimes have to look around at the various versions to sort out what really should wind up the file. In most cases it's pretty obvious.		In this case the diff doesn't completely make sense, but the first part (''.working'') is from the working copy and the second part is from the right hand URL given to merge, so it's the 'other' code. Aa I said above, you sometimes have to look around at the various versions to sort out what really should wind up the file. In most cases it's pretty obvious.

Ndp: /* The reintegrate option */

2014-02-14T21:14:00Z

The reintegrate option

← Older revision		Revision as of 21:14, 14 February 2014
Line 81:		Line 81:

	Supposed you run into:		Supposed you run into:
	~~<font size="2">~~		<source lang="bash">
	<source lang="sh">
	[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler		[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler
	svn: Cannot reintegrate from 'https://scm.opendap.org/svn/branch/xmlrequest/freeform_handler' yet:		svn: Cannot reintegrate from 'https://scm.opendap.org/svn/branch/xmlrequest/freeform_handler' yet:
Line 90:		Line 89:

	This message likely means that somewhere in the trunk a file was copied or moved. I think. The fix is to do the merge the old way, by hand, as it were. The following example is run in a working copy of the trunk code and the first URL given to merge is the last revision of the trunk that was merged to the branch. The second argument is the branch, which defaults to the HEAD revision. This is essentially what --reintegrate does.		This message likely means that somewhere in the trunk a file was copied or moved. I think. The fix is to do the merge the old way, by hand, as it were. The following example is run in a working copy of the trunk code and the first URL given to merge is the last revision of the trunk that was merged to the branch. The second argument is the branch, which defaults to the HEAD revision. This is essentially what --reintegrate does.
	<source lang="sh">		<source lang="bash">
	[jimg@zoe netcdf_handler]$ svn merge --dry-run $svn/trunk/netcdf_handler@19627 $svn/branch/xmlrequest/netcdf_handler		[jimg@zoe netcdf_handler]$ svn merge --dry-run $svn/trunk/netcdf_handler@19627 $svn/branch/xmlrequest/netcdf_handler
	--- Merging differences between repository URLs into '.':		--- Merging differences between repository URLs into '.':
Line 98:		Line 97:
	...		...
	</source>		</source>
	~~</font>~~
	How do you find that 'last merged trunk revision?' By sleuthing. Look at the log for the trunk and/or go to the Trac site and browse the trunk code. If you're lucky you're doing this 'reintegrate merge' (merging a branch to the trunk) just after merging the trunk to the branch to make sure the branch is up to date. In that case the last trunk version merged to the branch will be the current HEAD revision of the trunk and you could just say		How do you find that 'last merged trunk revision?' By sleuthing. Look at the log for the trunk and/or go to the Trac site and browse the trunk code. If you're lucky you're doing this 'reintegrate merge' (merging a branch to the trunk) just after merging the trunk to the branch to make sure the branch is up to date. In that case the last trunk version merged to the branch will be the current HEAD revision of the trunk and you could just say

	~~<font size="2">~~		<source lang="bash">
	<source lang="sh">svn merge $svn/trunk/netcdf_handler $svn/branch/xmlrequest/netcdf_handler</source>		svn merge $svn/trunk/netcdf_handler $svn/branch/xmlrequest/netcdf_handler
	~~</font~~>		</source>
	and leave off the explicit revision number.		and leave off the explicit revision number.

Ndp: /* Minor fixes once code has been tagged but before an official release */

2014-02-14T21:13:15Z

Minor fixes once code has been tagged but before an official release

← Older revision		Revision as of 21:13, 14 February 2014
Line 71:		Line 71:

	Since at this point the release branch will have been merged back to the trunk already, add the new changes first to the tag and then merge that tag back to the trunk. Use:		Since at this point the release branch will have been merged back to the trunk already, add the new changes first to the tag and then merge that tag back to the trunk. Use:
	~~<font size="2">~~		<source lang="bash">
	<source lang="sh">
	svn merge --dry-run $svn/tags/<component>/<version>		svn merge --dry-run $svn/tags/<component>/<version>
	</source>		</source>
	~~</font>~~
	in the trunk directory. If the dry run looks like its doing what you expect, then go ahead with the merge. If not, you probably should have put these changes on the branch and made a new version for release. Back the changes out of the tag and make a new tag, version and release.		in the trunk directory. If the dry run looks like its doing what you expect, then go ahead with the merge. If not, you probably should have put these changes on the branch and made a new version for release. Back the changes out of the tag and make a new tag, version and release.

Ndp at 21:03, 14 February 2014

2014-02-14T21:03:54Z

← Older revision		Revision as of 21:03, 14 February 2014
Line 20:		Line 20:

	Here's what it looks like in practice:		Here's what it looks like in practice:
	~~<font size="2">~~
	<source lang="bash">		<source lang="bash">
	cd $trunk		cd $trunk
Line 44:		Line 43:
	svn ci # Check in the code in $branch to svn's branch		svn ci # Check in the code in $branch to svn's branch
	</source>		</source>
	~~</font>~~

	== Merging process with only the destination code checked out ==		== Merging process with only the destination code checked out ==

Ndp: /* Merging from Branches Using only working copies of code */

2014-02-14T21:03:35Z

Merging from Branches Using only working copies of code

← Older revision		Revision as of 21:03, 14 February 2014
Line 21:		Line 21:
	Here's what it looks like in practice:		Here's what it looks like in practice:
	<font size="2">		<font size="2">
	<source lang="sh">		<source lang="bash">
	cd $trunk		cd $trunk
	svn up		svn up

Ndp at 17:38, 29 April 2013

2013-04-29T17:38:14Z

← Older revision		Revision as of 17:38, 29 April 2013
Line 88:		Line 88:
	<source lang="sh">		<source lang="sh">
	[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler		[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler
	svn: Cannot reintegrate from '~~http~~://scm.opendap.org/svn/branch/xmlrequest/freeform_handler' yet:		svn: Cannot reintegrate from 'https://scm.opendap.org/svn/branch/xmlrequest/freeform_handler' yet:
	Some revisions have been merged under it that have not been merged		Some revisions have been merged under it that have not been merged
	into the reintegration target; merge them first, then retry.		into the reintegration target; merge them first, then retry.

Ndp: /* Minor fixes once code has been tagged but before an official release */

2012-03-06T22:19:19Z

Minor fixes once code has been tagged but before an official release

← Older revision		Revision as of 22:19, 6 March 2012
Line 73:		Line 73:

	Since at this point the release branch will have been merged back to the trunk already, add the new changes first to the tag and then merge that tag back to the trunk. Use:		Since at this point the release branch will have been merged back to the trunk already, add the new changes first to the tag and then merge that tag back to the trunk. Use:
			<font size="2">
	<source lang="sh">		<source lang="sh">
	svn merge --dry-run $svn/tags/<component>/<version>		svn merge --dry-run $svn/tags/<component>/<version>
	</source>		</source>
			</font>
	in the trunk directory. If the dry run looks like its doing what you expect, then go ahead with the merge. If not, you probably should have put these changes on the branch and made a new version for release. Back the changes out of the tag and make a new tag, version and release.		in the trunk directory. If the dry run looks like its doing what you expect, then go ahead with the merge. If not, you probably should have put these changes on the branch and made a new version for release. Back the changes out of the tag and make a new tag, version and release.

Ndp: /* Merging branch to trunk again: Three Way Merge */

2012-03-06T22:18:53Z

Merging branch to trunk again: Three Way Merge

← Older revision		Revision as of 22:18, 6 March 2012
Line 150:		Line 150:
	It is '''crucial''' to this use case for subversion that '''each''' and '''every''' time you merge a branch back to the trunk that you create a tag of the branch at that time. Then later when you need to merge the branch back to the trunk again (to pickup additional changes that happened on the branch since the last merge) you will use the most recent tag. The syntax for this is described in the '''''svn book''''' in Chapter 4, in the section titled: '''''Merge Syntax: Full Disclosure'''''.		It is '''crucial''' to this use case for subversion that '''each''' and '''every''' time you merge a branch back to the trunk that you create a tag of the branch at that time. Then later when you need to merge the branch back to the trunk again (to pickup additional changes that happened on the branch since the last merge) you will use the most recent tag. The syntax for this is described in the '''''svn book''''' in Chapter 4, in the section titled: '''''Merge Syntax: Full Disclosure'''''.

	<font size="2">		<font size="3">
	<code>''svn merge [--dry-run] http://last.tag.url http://branch.url local_working_copy_of_trunk''</code>		<code>
			: svn merge [--dry-run] http://last.tag.url http://branch.url local_working_copy_of_trunk
			</code>
	</font>		</font>

	Where:		Where:
	* ''http://last.tag.url'' - is the subversion url of the last tag (associated with a merge to the trunk) for the branch in question.		* ''http://last.tag.url'' - is the subversion url of the last tag (associated with a merge to the trunk) for the branch in question.

Ndp at 22:17, 6 March 2012

2012-03-06T22:17:57Z

← Older revision		Revision as of 22:17, 6 March 2012
Line 83:		Line 83:

	Supposed you run into:		Supposed you run into:
			<font size="2">
	<source lang="sh">		<source lang="sh">
	[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler		[jimg@zoe freeform_handler]$ svn merge --reintegrate $svn/branch/xmlrequest/freeform_handler
Line 99:		Line 100:
	...		...
	</source>		</source>
			</font>
	How do you find that 'last merged trunk revision?' By sleuthing. Look at the log for the trunk and/or go to the Trac site and browse the trunk code. If you're lucky you're doing this 'reintegrate merge' (merging a branch to the trunk) just after merging the trunk to the branch to make sure the branch is up to date. In that case the last trunk version merged to the branch will be the current HEAD revision of the trunk and you could just say		How do you find that 'last merged trunk revision?' By sleuthing. Look at the log for the trunk and/or go to the Trac site and browse the trunk code. If you're lucky you're doing this 'reintegrate merge' (merging a branch to the trunk) just after merging the trunk to the branch to make sure the branch is up to date. In that case the last trunk version merged to the branch will be the current HEAD revision of the trunk and you could just say

			<font size="2">
	<source lang="sh">svn merge $svn/trunk/netcdf_handler $svn/branch/xmlrequest/netcdf_handler</source>		<source lang="sh">svn merge $svn/trunk/netcdf_handler $svn/branch/xmlrequest/netcdf_handler</source>
			</font>
	and leave off the explicit revision number.		and leave off the explicit revision number.

Line 109:		Line 111:

	Dealing with conflicts in the code:		Dealing with conflicts in the code:
			<font size="2">
	<source lang="sh">		<source lang="sh">
	/ set the structure values to create the FreeForm DB/		/ set the structure values to create the FreeForm DB/
Line 137:		Line 140:
	#endif		#endif
	</source>		</source>
			</font>

	In this case the diff doesn't completely make sense, but the first part (''.working'') is from the working copy and the second part is from the right hand URL given to merge, so it's the 'other' code. Aa I said above, you sometimes have to look around at the various versions to sort out what really should wind up the file. In most cases it's pretty obvious.		In this case the diff doesn't completely make sense, but the first part (''.working'') is from the working copy and the second part is from the right hand URL given to merge, so it's the 'other' code. Aa I said above, you sometimes have to look around at the various versions to sort out what really should wind up the file. In most cases it's pretty obvious.
Line 146:		Line 150:
	It is '''crucial''' to this use case for subversion that '''each''' and '''every''' time you merge a branch back to the trunk that you create a tag of the branch at that time. Then later when you need to merge the branch back to the trunk again (to pickup additional changes that happened on the branch since the last merge) you will use the most recent tag. The syntax for this is described in the '''''svn book''''' in Chapter 4, in the section titled: '''''Merge Syntax: Full Disclosure'''''.		It is '''crucial''' to this use case for subversion that '''each''' and '''every''' time you merge a branch back to the trunk that you create a tag of the branch at that time. Then later when you need to merge the branch back to the trunk again (to pickup additional changes that happened on the branch since the last merge) you will use the most recent tag. The syntax for this is described in the '''''svn book''''' in Chapter 4, in the section titled: '''''Merge Syntax: Full Disclosure'''''.

	''svn merge [--dry-run] http://last.tag.url http://branch.url local_working_copy_of_trunk''		<font size="2">
			<code>''svn merge [--dry-run] http://last.tag.url http://branch.url local_working_copy_of_trunk''</code>
			</font>
	Where:		Where:
	* ''http://last.tag.url'' - is the subversion url of the last tag (associated with a merge to the trunk) for the branch in question.		* ''http://last.tag.url'' - is the subversion url of the last tag (associated with a merge to the trunk) for the branch in question.

Ndp: /* Merging from Branches Using only working copies of code */

2012-03-06T22:16:38Z

Merging from Branches Using only working copies of code

← Older revision		Revision as of 22:16, 6 March 2012
Line 20:		Line 20:

	Here's what it looks like in practice:		Here's what it looks like in practice:
			<font size="2">
	<source lang="sh">		<source lang="sh">
	cd $trunk		cd $trunk
Line 43:		Line 44:
	svn ci # Check in the code in $branch to svn's branch		svn ci # Check in the code in $branch to svn's branch
	</source>		</source>
			</font>

	== Merging process with only the destination code checked out ==		== Merging process with only the destination code checked out ==