User:Robin Cornelius/hg folding patchsets - Revision history

Robin Cornelius: /* Folding patch sets with Mecurial */

2010-08-18T12:10:49Z

Folding patch sets with Mecurial

← Older revision		Revision as of 05:10, 18 August 2010
Line 5:		Line 5:
	Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.		Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.

	~~The way I am working is to create a branch for my development~~, ~~default contains~~ the ~~upstream code base pulled from viewer-development, my development is happening in branch development~~.		ensure there are no exiting patches in your repository, then work out what the start and end commit ids are for your series of commits you want to squash.

	~~Ensure you are on branch "development"~~		hg qimport -r commit_start_id:commit_end_id

	~~hg update development~~

	~~This needs improving as using a named branch does not work, but find the first commit to your development branch, this will be called S and will be the commit ID eg 14653. Then do the following~~

	hg qimport -r S:~~development~~
	hg qgoto qbase		hg qgoto qbase

Line 23:		Line 17:
	then finish up		then finish up
	hg gfinish qbase		hg gfinish qbase

			Do not share a repository then squash the commits and push again, it will probably cause chaos.

Robin Cornelius: /* Folding patch sets with Mecurial */

2010-08-18T11:15:01Z

Folding patch sets with Mecurial

← Older revision		Revision as of 04:15, 18 August 2010
Line 1:		Line 1:
	== Folding patch sets with Mecurial ==		== Folding patch sets with Mecurial ==

	With the Stowstorm project we hit a conceptual conflict with the commit little and often method of working, where one commits small changes in an incremental way when working on a given project feature/bugfix. At the end of the project it is desirable to provide one change set that contains your feature or bug so that the Snowstorm team can pull from your repository. It is very undesirable for them to pull in 100 Small changesets, that may contain trivial or useless information (to anyone other ~~that~~ yourself), that form your overall feature/bugfix.		With the Stowstorm project we hit a conceptual conflict with the commit little and often method of working, where one commits small changes in an incremental way when working on a given project feature/bugfix. At the end of the project it is desirable to provide one change set that contains your feature or bug so that the Snowstorm team can pull from your repository. It is very undesirable for them to pull in 100 Small changesets, that may contain trivial or useless information (to anyone other than yourself), that form your overall feature/bugfix.

	Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.		Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.

Robin Cornelius: /* Folding patch sets with Mecurial */

2010-08-18T11:14:21Z

Folding patch sets with Mecurial

← Older revision		Revision as of 04:14, 18 August 2010
Line 18:		Line 18:
	windows		windows
	FOR /F "delims=" %i IN ('hg qunapp') DO @set PATCHSET=%i		FOR /F "delims=" %i IN ('hg qunapp') DO @set PATCHSET=%i
			hg qfold %PATCHSET%
	linux		linux
	hg qfold $(hg qunapp)		hg qfold $(hg qunapp)
			then finish up
	~~hg qfold %PATCHSET%~~
	hg gfinish qbase		hg gfinish qbase

Robin Cornelius: /* Folding patch sets with Mecurial */

2010-08-18T11:13:50Z

Folding patch sets with Mecurial

← Older revision		Revision as of 04:13, 18 August 2010
Line 5:		Line 5:
	Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.		Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.

	The way i am working is to create a branch		The way I am working is to create a branch for my development, default contains the upstream code base pulled from viewer-development, my development is happening in branch development.

	~~WORK IN PROGRESS~~		Ensure you are on branch "development"

	~~C:\code\viewer-~~development>hg qimport -r S:~~tip~~		hg update development
	~~C:\code\viewer-development>~~hg qgoto qbase
	~~C:\code\viewer-development>~~FOR /F "delims=" %i IN ('hg qunapp') DO @set PATCHSET=%i		This needs improving as using a named branch does not work, but find the first commit to your development branch, this will be called S and will be the commit ID eg 14653. Then do the following
	~~C:\code\viewer-development>~~hg qfold %PATCHSET%
	~~C:\code\viewer-development>~~hg gfinish qbase		hg qimport -r S:development
			hg qgoto qbase

			windows
			FOR /F "delims=" %i IN ('hg qunapp') DO @set PATCHSET=%i
			linux
			hg qfold $(hg qunapp)

			hg qfold %PATCHSET%
			hg gfinish qbase

Robin Cornelius: Created page with '== Folding patch sets with Mecurial == With the Stowstorm project we hit a conceptual conflict with the commit little and often method of working, where one commits small change...'

2010-08-18T10:39:23Z

Created page with '== Folding patch sets with Mecurial == With the Stowstorm project we hit a conceptual conflict with the commit little and often method of working, where one commits small change...'

New page

== Folding patch sets with Mecurial ==

With the Stowstorm project we hit a conceptual conflict with the commit little and often method of working, where one commits small changes in an incremental way when working on a given project feature/bugfix. At the end of the project it is desirable to provide one change set that contains your feature or bug so that the Snowstorm team can pull from your repository. It is very undesirable for them to pull in 100 Small changesets, that may contain trivial or useless information (to anyone other that yourself), that form your overall feature/bugfix.

Under git this is extreamly trivial with squash, you can just squash down a bunch of commits to a single commit. Under Hg this is still possible but not quite as obvious.

The way i am working is to create a branch

WORK IN PROGRESS

C:\code\viewer-development>hg qimport -r S:tip
C:\code\viewer-development>hg qgoto qbase
C:\code\viewer-development>FOR /F "delims=" %i IN ('hg qunapp') DO @set PATCHSET=%i
C:\code\viewer-development>hg qfold %PATCHSET%
C:\code\viewer-development>hg gfinish qbase