Comment # 11 on bug 954556 from Tony Mechelynck

In reply to comment #9:

I haven't tried to intentionally reproduce the bug. The workaround mentioned in
comment #9 works, but if I forget to delete the problematic file, and there are
upstream changes to it, "hg fetch" will pull the changes but not merge them and
I have to delete the file manually ("make" will recreate it the next time I
build) and then "update" my clone to the appropriate changeset to "merge" the
changes manually.

I suppose (and regret) that this bug will remain WONTFIX. Anyone willing and
able to solve it, feel free to REOPEN it and ASSIGN it to yourself. Or report
it to Mercurial if that's where it should be solved; but the Mercurial guys
will propably answer: "You're using an old version of Mercurial; upgrade to the
latest version first, and then we can talk business."