Re: Git patch won't apply

[Carl D. Sorensen]

On 1/10/09 10:22 AM, "Neil Puttock" <address@hidden> wrote:

> Hi Carl,
> 
> 2009/1/10 Carl D. Sorensen <address@hidden>:
> 
>> Any thoughts on what is wrong or how I can get this patch to apply?
> 
> It applies OK using `git am'.

Thanks for the tip.   I hadn't known about git am.

But it still didn't apply properly for me:

sorensen2:lilypond-working Carl$ git am
Frog_Patches/0001-Docs-Add-new-procedure-for-barNumberVisibility.patch
Applying: Docs: Add new procedure for barNumberVisibility
/Users/Carl/lilypond-working/.git/rebase-apply/patch:16: trailing
whitespace.
@c Uncomment this after next LSR update.
/Users/Carl/lilypond-working/.git/rebase-apply/patch:17: trailing
whitespace.
@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
/Users/Carl/lilypond-working/.git/rebase-apply/patch:18: trailing
whitespace.
@c {printing-the-bar-number-for-the-first-measure.ly}
/Users/Carl/lilypond-working/.git/rebase-apply/patch:19: trailing
whitespace.

fatal: git apply: bad git-diff - expected /dev/null on line 46
Patch failed at 0001.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Any other ideas?

Thanks,

Carl