enforce-single-head = yes prevents commit, although there are no multiple heads
Sushil Khanchi
sushilkhanchi97 at gmail.com
Tue Dec 22 17:36:26 UTC 2020
On Sat, Dec 19, 2020 at 1:35 AM Uwe Brauer <oub at mat.ucm.es> wrote:
> >>> "SK" == Sushil Khanchi <sushilkhanchi97 at gmail.com> writes:
>
> > On Thu, Dec 17, 2020 at 6:45 PM Uwe Brauer <oub at mat.ucm.es> wrote:
> >>
> >> > On Thu, Dec 17, 2020 at 2:03 PM Uwe Brauer <oub at mat.ucm.es> wrote:
> >>
> >> > Yes, if the working directory parent has an active topic `hg
> heads` gives
> >> > an incorrect result. There is a Merge Request to fix this which
> will be
> >> > merged soon. See
> >> > https://foss.heptapod.net/mercurial/evolve/-/merge_requests/286
> >>
> >> That also may explain why
> >> enforce-single-head = yes prevents commit
>
To be clear, you are using "experimental.single-head-per-branch=yes",
right? Or there is this (enforce-single-head) config option as well, which
I am not aware of?
>>
> >> Also there are no multiple heads?
>
>
> > But you see multiple heads if you check them using a revset? If so,
> then I
> > guess it's doing the right thing.
>
> Do mean with something like
>
> hg log -r tip -T '{count(revset("head()"))}\n'
>
Yes. For e.g. if you are about to create multiple heads on branch `foo` and
`hg log -r "head() and branch('foo')" has at least one changeset, then
I suppose config option doing its job in the right way.
But if you don't see any changeset from that revset and still see that
error ("rejecting multiple heads on branch....) then we probably have an
issue with the config option.
> (Ignore `hg heads` for now, as it is buggy.)
>
> ok
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20201222/3cb2cb6a/attachment-0002.html>
More information about the Mercurial
mailing list