Can I squash commits in Mercurial?

Question

I have a pair of commits that should really be just one. If I was using git, I would use:

git rebase -i 

and then

Answer 1

The Rebase extension worked like a charm. To squash 2 commits:

$ hg rebase --dest .~2 --base . --collapse

Dot is a shortcut for current revision.

It's even easier when you have a few commits on a branch and want to collapse them all into one:

$ hg rebase --dest {destination branch (e.g. master)} --base . --collapse

How this works:

(from http://mercurial-scm.org/wiki/RebaseExtension#Collapsing)

Answer 2

I use:

hg phase --draft --force -r 267
...
hg rebase --dest 282 --source 267 --collapse