repository with subrespository: I am stuck with a nested nested path problem

Uwe Brauer oub at mat.ucm.es
Thu Dec 30 17:31:20 UTC 2021


>>> "AS" == Anton Shestakov <engored at gmail.com> writes:

>> abort: path 'Neu-Einstufung/DocX-Neu' is inside nested repo 'Neu-Einstufung'
> This suggests that hg tries to handle a file from a subrepo in the
> context of the main repo. This could happen when that file was a part
> of the main repo and then it was moved to a subrepo, and hg is trying
> to e.g. rebase an old commit from when the file was a part of the main
> repo onto a commit when that file no longer lives there. You need to
> figure out where that file lives in 58 and in the evolve destination
> (try --dry-run to see the destination). If the file lives at a
> different repo now, it could be possible to recreate the subrepo setup
> and rebase 58 on top of that first, and then rebase the whole stack to
> where you want it to be, but if what sounds complicated, the easiest
> way to deal with this is to recreate whatever changes you have in 58
> again, by hand.

Thanks I will try that 
> You should know that subrepos were always a feature of last resort:
> https://www.mercurial-scm.org/wiki/Subrepository

Well it is somehow convenient, I have to say.
> Also don't ever use rollback.

Oh that is an alias for uncommit -a
that command should be ok?

The reason I am using it the following: sometimes I obtain changeset
after a commit of the form

  changeset:   117:efa0d2282e73
│╲   Branch:      default://application
│ │  tag:         tip
│ │  Author:      Uwe Brauer <oub at mat.ucm.es>
│ │  Date:        Wed, 29 Dec 2021 19:04:05 +0100
| |  Topic:       application
│ │  Phase:       draft
│ │  Summary:     Merge with recovered version

Which is odd. That is why  I uncommit and recommit and the strange 

default://application 

Is again

default

As it should be. 


I mentioned this strange behavior some time ago, but
also could not provide a recipe in order to reproduce it.



> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial
-------------- 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/20211230/a5cb360e/attachment.p7s>


More information about the Mercurial mailing list