Re: Cannot Merge Staging - fails make doc (missing @end lilypond - I think)

[David Kastrup]

James <address@hidden> writes:

> Patchy cannot merge current staging because of make doc errors.
>
> Fails here:
>
> --snip--
> % ****************************************************************
> % ly snippet:
> % ****************************************************************
> \sourcefileline 77
> #(use-modules (scm accreg))

>>>
>
> New commands @code{markLengthOn} and @code{markLengthOff} control
> the allowance of horizontal space for tempo and rehearsal marks.
> g,2 g
> \bar "||"
> \markLengthOff
> \tempo "Molto vivace" c2 c'
> \mark#1
> \tempo "Meno mosso" R1*16
> \mark\default
> g,2 g
>
> --snip--
>
> Which seems to be this commit
>
> http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff;h=31eb334fd29dc0ebd3603eab72e3db5c2e7b3928
>
>
> @Keith, I think you missed an '@end lilypond' or you took the one from
> the previous @lilypond example and forgot to replace it.

Hi Keith, I'll clean up staging, likely _including_ the first convert-ly
rule.  That gives you a chance to do a git-rebase -i in order not to
commit with reverts.

I'll report back later exactly what I had to take out.

-- 
David Kastrup