From: Andy Parkins <andyparkins@gmail.com>
Date: Thu, 22 Feb 2007 11:13:42 GMT
Subject: Re: git-am failed, what's next ?
Message-ID: <200702221113.44338.andyparkins@gmail.com>
In-Reply-To: <7v8xeqh6bj.fsf@assigned-by-dhcp.cox.net>

On Thursday 2007 February 22 09:47, Junio C Hamano wrote:

> If you have the pre-image blobs the patch was created against,
> and the patch was created with git and records "index" lines
> like these correctly:
>
>         diff --git a/builtin-config.c b/builtin-config.c
>         index 0f9051d..f1433a4 100644
>
> then you can tell git to fall back on 3-way merge to apply the
> patch.  After seeing "git am ./mbox" fail, you could try

Magic.  I had no idea about this.  Could it be made even more magical by doing 
this for you?

git-am would know if the patch that failed is a git-generated patch, so when 
things go wrong, before bombing out it could try a 3-way merge.  It's much 
easier to resolve faults with the usual conflict markers than reading 
patches.  It's also possible that the 3-way merge will succeed and git-am 
will continue without ever needing to worry the user.


Andy
-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com