abort: untracked files in working directory differ from files in requested revision

[Marcin Kasperski]

> hg status does not return anything
>
> But 
>
> hg up 585
> build/master-english.pdf: untracked file differs

My bet is:

a) build/master-english.pdf exists just now

b) you have *.pdf in .hgignore

    { therefore status doesn't report it }

c) you had commited (and later hg-removed) this pdf in the past, so
   in rev 585 it was indeed commited.

So, when you update to 585 there indeed is conflict between file
commited then and file present now.

Main cause of the confusion is that the file is hgignored now.