[PATCH] update: teach hg to override untracked dir with a tracked file on update

[timeless]

Not commenting on correctness (i'm quite worried, blackbox tests
actually use directories as standins for evil file permissions...),

Kostia Balytskyi wrote:
> it is empty. Backing up an empty folder seems to go agains Mercurial's

`against`