Some research about hg rebase, which Juan pointed me to. Apparently we can rebase in mercurial too. Yey for competition on features ;)