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://[email protected]/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://[email protected]/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
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Evolve-testers mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/evolve-testers
