Interest in integrating hg-git into Mercurial
Josef 'Jeff' Sipek
jeffpc at josefsipek.net
Mon Aug 19 08:12:36 EDT 2019
On Fri, Aug 16, 2019 at 16:58:56 -0400, Augie Fackler wrote:
> On Aug 1, 2019, at 22:30, Gregory Szorc <gregory.szorc at gmail.com> wrote:
> > I would prefer we interface with Git repositories using the storage
> > abstraction and not have to maintain a shadow Mercurial repository as
> > well. And I do think that is technically viable.
> For your consideration, a (crude) prototype: phab.mercurial-scm.org/D6734
> It's a hack, but that's under a week of hacking, even when I try to
> account for the reuse of code I had laying around. You're right that
> octopus merges will be a pain, but it looks like rationalizing the
> dirstate interface is the real big hassle at the moment. I suspect we
> could dummy up octopus merges with some weird hash tricks...
I certainly haven't done a proper survey, but AFAIK virtually all git repos
have *zero* octopus merges. So, I think it would be acceptable (at least
initially) if this code just refuses to work on repos with octopuses.
*NOTE: This message is ROT-13 encrypted twice for extra protection*
More information about the Mercurial-devel