>>> "MK" == Marcin Kasperski 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 }
> 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
Hi
I know I should not add bin files, such as pdf, but for some reason I
have to do so.
So
hg status does not return anything
But
hg up 585
build/master-english.pdf: untracked file differs
abort: untracked files in working directory differ from files in requested
revision
That seems
On 8/1/20 1:48 PM, Uwe Brauer wrote:
"PD" == Pierre-Yves David writes:
> The issue here are the untracked files in your working directory. What
> does `hg status` says?
Nothing, this is the bizarre thing.
But I found the reason for the reported misbhaviour.
Apparently my
>>> "PD" == Pierre-Yves David writes:
> The issue here are the untracked files in your working directory. What
> does `hg status` says?
Nothing, this is the bizarre thing.
But I found the reason for the reported misbhaviour.
Apparently my collaborator renamed a file via mv old new,
and pushed.
I pulled and now run
hg tip up,
To see what's new on the default branch and obtain
abort: untracked files in working directory differ from files in requested
revision
Now what is the best strategy to deal with this?
1. I could strip his changes merge my branch into default
in working directory differ from files in requested
revision
Now what is the best strategy to deal with this?
1. I could strip his changes merge my branch into default and pull
again, however I am not really sure I want to merge at this state
