title: How to wind back a commit using "hg revert"?
body: <p>I did a commit that I had to revert on my server because it wasn't working. I did "hg revert --all --rev 855" and stripped my changes from my Bitbucket and my local. When I did "hg update" and tried to pull the next changes I made I got "abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)"</p>
  
  <p>How can I go forward with just the wanted changes and lose the commits/heads? </p>