mercurial - How to rebase in tortoisehg?

Question

Often after committing changes, I do a pull, before pushing my changes, and someone has already committed changes. I could do another (merge) commit, but where possible I like to maintain linear history, as it makes things a bit easier to read.

So how does one rebase a changeset using tortoisehg, without resorting to using the command line?

Answer 1

First enable rebase:

File -> Settings -> Extensions

Then (after restarting tortoisehg)

1. Update to the changeset you want to rebase on to.

2. Right click on change you want to rebase and select the Modify History -> Rebase menu.

3. Click Rebase.

And you should end up with something like this:

Warnings:

1. It's not usually a good idea to rebase a changeset with a public Phase.
2. Avoid rebasing changes that are likely to produce complicated merge conflicts.