Difference between revisions of "User:Robin Cornelius/hg folding patchsets"
(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...') |
(No difference)
|
Revision as of 03:39, 18 August 2010
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