Accidentally rebased only one of my change sets

I had 3 change sets that I wante开发者_StackOverflowd to rebase on top of the latest revisions. Unfortunately, I selected only one of them to be rebased and so this did a merge. Is there any way I can either undo the rebase or change it so the other two change sets get rebased as well?

---

Assuming you haven't pushed it to another repo for others to grab, then you can put those changesets anywhere on the graph you want. You can move changesets with hg rebase and prune changsets and their descendents with hg strip.

Both strip and rebase save "undo" information as bundle files in your .hg/strip-backup/

Note that neither strip nor rebase are enabled by default with mercurial. You need to enable them in the .hgrc file.

---

If it's the very last thing you did you can do a 'hg rollback' which is a one-level undo. If, however, you've done anything since that alters the repository state (push, pull, commit, etc.) then rollback won't help you.

If it's any consolation, merging is generally preferable to rebasing and a mercurial history with a lot of merges shows someone who is using mercurial to its fullest. :)