Re: [PATCH] Extended documentation on Turkish classical music and makam

[Carl Sorensen]

On 9/2/09 9:53 AM, "Joseph Wakeling" <address@hidden> wrote:

> Trevor Daniels wrote:
>> 
>> Joe, you wrote Tuesday, September 01, 2009 8:49 PM
>> 
>>> Attached is a patch to extend the NR documentation on Turkish classical
>>> music as defined in the file makam.ly.
>> 
>> Thanks for this, but I'm afraid the patch has whitespace errors
>> and also fails to apply.
> 
> I don't understand what 'whitespace errors' are -- sorry, this is my
> first time using texinfo and git on a project.  If you can explain in
> more detail what's wrong and how to fix it I'll get it done ASAP.

Whitespace errors mean that there is a whitespace character (space or tab,
most likely) at the end of the line.

I avoid this problem by setting my editor (I use vim) to eliminate all
trailing whitespace when I save a file.

When applying patches, whitespace errors can be fixed by using the

--whitespace=fix

option for git apply.

> 
> As for failing to apply ... I guess this is down to the patch being made
> against an earlier revision than the current git tree?  So I should
> merge from the LP development branch and then resubmit the patch ... ?

Yes, this is correct.  But the terminology we generally use is "master", not
"LP development branch".

Thanks,

Carl