Concatenating multiple changesets into one

(See also: EditingHistory, HisteditExtension (which provides an editor-driven UI for this), CollapseExtension, RebaseProject (section Collapsing)).


Suppose you want to concatenate the last k changesets of a repository

into a single, combined changeset

Revert solution (using hg only)

Execute the following steps:

1: hg -R oldrepo update S

2: hg -R oldrepo revert -r tip --all

3: hg -R oldrepo commit -m "Combine changesets S+1..S+k"

4: hg clone -r tip oldrepo newrepo

Patch solution (using hg only)

Make a patch containing the changesets you want to concatenate.
1: hg -R oldrepo export --git -r S:tip > patchfile

Make a partial clone of the repository, up to and including the parent of S. This discards the patch changesets.
2: hg clone -r "p1(S)" oldrepo newrepo

Import the patch in the cloned repository as one changeset.
3: hg -R newrepo import -m "Combine changesets S+1..S+k" patchfile

Patch queue solution (using mq)

Integrate the changesets you want to concatenate in a patch queue (verify you don't have pending patches there using hg qseries).
1: hg qimport -r S+1:tip

(note how the start of the commit range specified is the fist commit we want to squash: S+1)

Pop all the patches but the first.
2: hg qgoto qbase

"Fold" unapplied patches, i.e. concatenate changesets.
3: hg qfold $(hg qunapp)
3: for /F %i in ('hg qunapp') do hg qfold %i (Windows)
This has the big advantage over the previous method that the commit messages will also be concatenated (separated by the * * * string). You can see the message using hg qhead and edit it using hg qrefresh -e.

Reintegrate the folded patch in the repository.
4: hg qfinish qbase
tip is now the concatenation of former changesets S:tip. There's no extra branch left, therefore no additional cleanup to do.


ConcatenatingChangesets (last edited 2013-10-10 10:48:33 by RamiroMorales)