BTW Alexis noted two problems:

- we should require hg merge --force when there are deleted files

- we should fix handling of deleted files.

but there is only a patch for #2 AFAIK. Has anyone taken a look at #1? In
particular, 'hg fetch' should probably abort in this situation, I think.