Re: Issue 1988 in lilypond: Patch: Rename \markuplines to \markuplist (before running convert-ly)

[David Kastrup]

Graham Percival <address@hidden> writes:

> On Fri, Oct 28, 2011 at 08:23:18AM +0200, David Kastrup wrote:
>> Graham Percival <address@hidden> writes:
>> 
>> > incidently, I saw that I increased the version number properly
>> > after 2.15.15; all that's was missing is a new release.
>> 
>> PACKAGE_NAME=LilyPond
>> MAJOR_VERSION=2
>> MINOR_VERSION=15
>> PATCH_LEVEL=16
>> MY_PATCH_LEVEL=
>> VERSION_STABLE=2.14.2
>> VERSION_DEVEL=2.15.15
>
> yes, that looks correct at the time that I sent that email.  At
> that time, the latest release was 2.15.15.  The PATCH_LEVEL in git
> was 2.15.16, and _DEVEL was 2.15.15.
>
> I have just release 2.15.16, and VERSION now has PATCH_LEVEL=17
> and _DEVEL= 2.15.16.  I have pushed, and both git status and gitk
> report no unpushed commits.
>
>> My python/convertrules.py aims for 2.15.17 however, as the
>> \makeStringTuning change is already committed:
>
> Committed in your personal branch, rather than master?  yes, that
> sounds correct.

\makeStringTuning is a 2.5.16 rule and already in master.  \markuplist
is 2.5.17 and will go in now.

> You should now either put that commit up for review, or else push
> it to dev/staging.  (incidently, I can't do a merge --ff-only from
> master to staging right now, so we could use your help there).

The last rebase would be responsible.  I'll rewind dev/staging soonish.

> Once it's in staging (whether or not it went through a countdown),

I won't put it through another countdown just because of the version
number.

10 minutes or so.

-- 
David Kastrup