Re: [PATCH 1/2] am: preliminary support for hg patches
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
Show 17 quoted lines
> ... This is
> correctly detected by -3, with
>
> Applying: Threeway test
> fatal: sha1 information is lacking or useless (dir.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Threeway test
>
> The message is a bit misleading (it's not the repo lacking the blobs,
> it's the patch missing the information), but the process fails as
> expected.
>
>> What about renaming patches?
>
> They lack similarity indices, but they seem to be properly formated
> (and the simple cases I tested apply correctly).
These were exactly what I wanted to know. Thanks for experimenting.
> So I think that keeping the --git is the right choice.
Yeah, sounds like we are safe and better off keeping it.
Junio C Hamano <gitster@pobox.com>