First: View your changes with hg log.
The following didn't help in my case:
hg pull and hg merge (before you pull check against hg incoming)
- or:
hg pull --rebase
But this helped.
hg merge [revision]
I found that I needed to explicitly merge some revisions which looked like heads.