Re: [PATCH 1/2] am: preliminary support for hg patches

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 1/2] am: preliminary support for hg patches

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:57

Giuseppe Bilotta [off-list ref] writes:
... 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.
quoted
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.

Re: [PATCH 1/2] am: preliminary support for hg patches

From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:51:57

Heya,

On Tue, Aug 30, 2011 at 19:02, Junio C Hamano [off-list ref] wrote:
These were exactly what I wanted to know. Thanks for experimenting.
And thanks for working on this, Giuseppe!

-- 
Cheers,

Sverre Rabbelier
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help