title: Mercurial/hg: get changes out of branch and into trunk
body: <p>Apparently I've checked the last couple of week's commits into a branch. Apart from the changes to one file, I want to commit everything to the trunk. What do I do?</p>