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

[Trevor Daniels]

Joe, you wrote Wednesday, September 02, 2009 4:53 PM


> Trevor Daniels wrote:
> > 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.

In that case you're doing pretty well!  The .itely files should not 
have
any spaces at the end of the lines ("trailing whitespace").  When
editing LilyPond files of any sort it is safest to set your editor 
to
remove trailing whitespace on saving, if that option is available.
Otherwise you have to do it manually.  However, that alone is
not a serious problem, as I can easily remove trailing whitespace
myself before I commit the patch.

> 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 
> ... ?

This is more serious, as I can't fix this at this end.  It may well
be due to creating the patch from an earlier revision.  If you know
the SHA1 ID of the revision you used to make the patch you
could simply mail it to me.  I can then apply the patch against that
revision at this end and cherry-pick it forwards.

Trevor