Re: importing mercurial patch

From: Ondrej Certik <ondrej@certik.cz>
Date: Nov 11, 2008, 12:18 UTC
Message-ID: <85b5c3130811110418l11be8084sf0f47a1095755747@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0811111258260.30769@pacific.mpi-cbg.de>

On Tue, Nov 11, 2008 at 1:00 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 20 quoted lines

> Hi,
>
> On Tue, 11 Nov 2008, Ondrej Certik wrote:
>
>> I'd like git to be able to import mercurial-exported patches.
>
> Have you seen
>
>        http://repo.or.cz/w/fast-export.git/
>
> ?
>
> I had many problems with it, so many that I started to write my own
> hg-fast-export together with Dirkjan Ochtman, a very nice Mercurial guy
> (actually, he started writing it, and I tried to fix it, but it still does
> not work due to merge mishandling).
>
> But then I saw that finally, they started work on it again.  It is
> somewhat sloppy, having a large part in Python and a large part in shell,
> which could have been avoided, but at least it works.

Yes, I use fast-export to convert from hg to git on the fly. But as I understood it, you need to have the whole repository converted. So if someone sends the patch in the mercurial format, I just want to apply it to git, instead of applying it to hg first and then converting. Well, you are right, that this is definitely one way of doing it.

But imho if git supported mercurial patches, life would be a lot easier.

Ondrej