Hi,
I've pulled the Subversion repository into a local Hg repository while at work. At home, I fixed some stuff, committed into my local Hg repository, and upon coming to work I did a pull and an update.
$ hg pull
$ hg update
I needed to merge, so I did that.
$ hg merge
However, when I tried pushing:
$ hg push
abort: Sorry, can't find svn parent of a merge revision."
What mistake did I make in the workflow? What can I do to avoid the issue in the future?