Re: Issue 2136 in lilypond: Patch: Doc: Usage --include option layout consistency

[lilypond]

Updates:
        Labels: -Patch-push Patch-new

Comment #7 on issue 2136 by address@hidden: Patch: Doc: Usage --include  
option layout consistency
http://code.google.com/p/lilypond/issues/detail?id=2136

Hello, I cannot (now) apply this patch to my own git.

If using git am I get:

--snip--
Applying: Doc: Usage running LP CLI layout consistency
error: patch failed: Documentation/usage/running.itely:133
error: Documentation/usage/running.itely: patch does not apply
Patch failed at 0001 Doc: Usage running LP CLI layout consistency
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".
--snip--

and if I try using 'patch' from Rietveld directly I get:

--snip--
address@hidden:~/lilypond-git$ patch -p1  
< ../Desktop/issue5504084_2001.diff
patching file Documentation/usage/running.itely
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file  
Documentation/usage/running.itely.rej
--snip--

I've tried other patches on my tree and they apply fine but cannot see why  
this one specifically fails. Esp since Patchy said it was ok as well.

Could someone else try on the most current master?

I'll make a new patch and re-submit for review if I need to, it's no bother  
but I cannot understand why this patch specifically no longer applies for  
me.

James