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

[David Kastrup]

David Kastrup <address@hidden> writes:

> James <address@hidden> writes:
>
>> Patchy cannot merge current staging because of make doc errors.
>
> 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.

Ok, here is what I'll be taking out:


commit 9f8a7df486ca341f06435cf2117522a402b9748a (origin/staging)
Author: Keith OHara <address@hidden>
Date:   Fri Sep 20 23:14:50 2013 -0700

    Revert "convert-ly rule"
    
    This reverts commit 167302378309a2597ce2628077a0d4d15f5c4b6b.

 python/convertrules.py | 7 -------
 1 file changed, 7 deletions(-)

commit fb2360e7312617caa5a9f649c34b6ea690d79774
Author: Keith OHara <address@hidden>
Date:   Sun Sep 15 22:58:07 2013 -0700

    Tuplets: error-checking; issue 3551
    
    lily/tuplet-engraver.cc
      do not create a TupletBracket if it would have no bounds
    lily/tuplet-bracket.cc
      defensive pointer check

 lily/tuplet-bracket.cc  | 6 ++++--
 lily/tuplet-engraver.cc | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 31eb334fd29dc0ebd3603eab72e3db5c2e7b3928
Author: Keith OHara <address@hidden>
Date:   Tue Sep 10 11:19:05 2013 -0700

    Docs: new defaults for rehearsal mark alignment

 Documentation/changes.tely                     | 30 ++++++++++++++++++++++++++
 Documentation/notation/changing-defaults.itely |  4 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)

commit 167302378309a2597ce2628077a0d4d15f5c4b6b
Author: Keith OHara <address@hidden>
Date:   Sun Sep 15 22:33:35 2013 -0700

    convert-ly rule

 python/convertrules.py | 7 +++++++
 1 file changed, 7 insertions(+)

commit 23b2550451ad9f0c5059fb0a9e822555f6539ef7
Author: Keith OHara <address@hidden>
Date:   Sun Sep 15 22:33:35 2013 -0700

    convert-ly rule

 python/convertrules.py | 3 +++
 1 file changed, 3 insertions(+)


This will give you a clean slate on Documentation/changes.tely as well
as on python/convertrules.py.  It also means that you'll have to
recommit the tuplet changes.  Hope that's ok.

I would have mentioned that it's a good idea just to run "make" again
before pushing (as this syntax-checks all the Texinfo even if not the
contained @lilypond passages), but to be honest: I probably don't do
that half of the time either.  And after all, the staging/master/patchy
setup means that most of the work lands at the feet of those who "did
the deed", so not worth losing much sleep over.

I'll move the current staging to staging-bad as a backup.

-- 
David Kastrup