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

[Uwe Brauer]

>>> "MK" == Marcin Kasperski <Marcin.Kasperski at mekk.waw.pl> writes:

>> 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.

Right, it is quite a bit of a mess, if you start to ignore pdf files (as
you maybe should) but then are forced to add some but not all pdfs.

But I am not sure what would be the best workflow. Anyhow 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210310/e29180ab/attachment.p7s>