topic.linear-merge = allow-from-bare-branch and hg-git

[Uwe Brauer]

Hi

The following unfortunately does not work. I clone a git repository and
want to do a no-fast-forward merge using the new topic.linear-merge = allow-from-bare-branch
from evolve.

The merging works but then I cannot push:

Here are the steps to reproduce whats happening.
 hg clone git+ssh://oub@git.code.sf.net/p/matlab-emacs/src
 mv src/
 mv src/ matlab-sf-hg
 cd matlab-sf-hg
 hg topic -r 'f452f1652810:tip' usage2
 hg up master
 hg merge tip
 hg ci "Merge usage1 into master"

Hg push 
pushing to git+ssh://oub@git.code.sf.net/p/matlab-emacs/src
Warning: Permanently added 'git.code.sf.net,216.105.38.16' (ECDSA) to the list of known hosts.
searching for changes
abort: pushing refs/heads/usage1 overwrites fdc13a48aa41
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20201203/46ea6bb4/attachment.bin>