hg up - unexpected/cofusing error

[Ernie Rael]

On 23/05/25 10:42 PM, Dr. Arne Babenhauserheide wrote:
> Ernie Rael<errael at raelity.com>  writes:
>
>> I wouldn't have thought the following is possible, since purge gets
>> rid of untracked files.
>>
>> I just did "hg pull; hg pull upstream; hg up release180" where tip is
>> from upstream. This is hg-git repository.
>>
>> Any idea how to clean this up? tried "hg git-cleanup", "hg verify" is OK.
>>
>> -ernie
>>
>> err at harmony:/ref/nb/src/netbeans
>> $ hg purge
>> err at harmony:/ref/nb/src/netbeans
>> $ hg up release180
>> ...
>> webcommon/javascript2.editor/test/unit/data/testfiles/ecmascript6/parser/statement/with/with03.js.ast.xml:
>> untracked file differs
>> abort: untracked files in working directory differ from files in
>> requested revision
> This sounds like the git-error on git checkout, when git status sees an
> untracked file, but I’m not sure why git throws that, because it should
> be a bare repository.
>
> Do you maybe have a git-subrepository?

Yes, the main repo is on github, and it does have a git sub-repo.

Oops, I didn't mention that this is hg-git. I have a local "main repo" 
and make shared repos off of it. Shares are created with

    hg share -B \
             --config fsmonitor.mode=on \
             --config subrepos.git:allowed=true \
             /junk/BACK_REF/nb/src/netbeans "$@"

and then

    [subrepos]
    git:allowed = true

Added to the share's hgrc.

After the repo became inoperable, I made a new share. "hg up" works fine 
in the new share.

-ernie

>
> Best wishes,
> Arne

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20230525/496f2973/attachment-0001.html>