Re: git-am failed, what's next ?

Hi,

On 2/22/07, Andy Parkins [off-list ref] wrote:

I've often wished for more information from git-am (or more correctly,
git-apply).  However, you can sometimes get what you need to know another
way.

it seems pretty the same flow that I'm used to doing except that I
used 'patch' instead of 'git-apply'...

 * First, make sure that your current tree is checked in so you can get back
   to it easily.  Maybe switch to a new temporary branch to make it easy to
   return to your current point.
 * Then run git-am to get the number of the failing patch, in your example
   it's "0001"
 * Now, try and apply the patch manually, but turn on verbose and reject in
   git-apply
    $ git-apply --verbose --reject .dotest/0001
   This is the only way I've found to get git to tell you which hunk of the
   patch is being rejected.  Unfortunately, it will also leave you with that
   patch partially applied.

hm, I actually used 'patch' instead because I wasn't aware of
'--reject' option. The default behaviour is different, and I'm not
sure to know why...

Obviously I really should play with it.

Hope that helps.

thanks
-- 
Francis