Re: Staging->Master

[David Kastrup]

David Kastrup <address@hidden> writes:

> Reinhold Kainhofer <address@hidden> writes:
>
>> On 2012-02-02 18:11, Phil Holmes wrote:
>>> ----- Original Message ----- From: "David Kastrup" <address@hidden>
>>> To: "Phil Holmes" <address@hidden>
>>>>
>>>>> I believe James indicated his big machine was on 24x7 - hence my
>>>>> instructions if he has some time to look at this.
>>>>
>>>> I think that this would be the preferable solution.  Even though patchy
>>>> is quite less painful on my current machine than on the one I had been
>>>> using a few days ago, it takes its time.
>>>
>>> My box runs it quite quickly and is not used for anything else.  It
>>> has to be turned on to run patchy though.  Suggest you leave it to
>>> me for now unless you're experimenting.
>>
>> My new office machine (on 24/7) is quite a powerful beast, and I
>> usually don't to any expensive calculations. So, I can certainly set
>> up a cronjob to run patchy regularly.
>
> Since I just pushed about 4 patches (2 of them from me) and there has
> been another translation merge (they tend to be prone to surprises in
> particular when we have syntax changes), I started a patchy staging run
> right now and it should be through in about 1-2 hours.  I want the
> feedback timely in case anything went wrong.

Looking at the involved list, that's actually an impressive lot:

Updating 3ff2bd6..8770c57
Fast-forward
 Documentation/changes.tely                         |   21 +-
 Documentation/contributor/issues.itexi             |    2 +-
 Documentation/de/notation/input.itely              | 1222 ++-
 .../de/notation/notation-appendices.itely          |   52 +-
 Documentation/de/web/community.itexi               |   24 +-
 Documentation/es/changes.tely                      |   29 +-
 Documentation/es/notation.tely                     |    2 +-
 Documentation/es/notation/fretted-strings.itely    |    2 +-
 Documentation/es/notation/input.itely              |   39 +-
 Documentation/es/notation/repeats.itely            |   19 +-
 Documentation/es/notation/rhythms.itely            |   12 +-
 Documentation/es/notation/simultaneous.itely       |    2 +-
 Documentation/es/search-box.ihtml                  |   14 +-
 Documentation/es/usage/external.itely              |  101 +-
 Documentation/es/usage/lilypond-book.itely         |   33 +-
 Documentation/es/usage/running.itely               |   15 +-
 Documentation/es/web/introduction.itexi            |    8 +-
 Documentation/hu/learning/fundamental.itely        |    2 +-
 Documentation/it/GNUmakefile                       |    2 +-
 Documentation/it/notation.tely                     |  127 +
 Documentation/it/notation/GNUmakefile              |    5 +
 Documentation/it/notation/notation.itely           |   37 +
 Documentation/it/notation/pitches.itely            | 3019 +++++
 .../it/texidocs/adding-ambitus-per-voice.texidoc   |    7 +
 .../texidocs/ambitus-with-multiple-voices.texidoc  |    8 +
 ...yles-depending-on-the-step-of-the-scale.texidoc |   21 +
 .../it/texidocs/changing-the-ambitus-gap.texidoc   |    7 +
 ...tied-notes-at-the-start-of-a-new-system.texidoc |    8 +
 .../non-traditional-key-signatures.texidoc         |   24 +
 .../it/texidocs/numbers-as-easy-note-heads.texidoc |   11 +
 Documentation/it/texidocs/ottava-text.texidoc      |    9 +
 ...naturals-from-being-automatically-added.texidoc |   10 +
 ...-printed-when-the-key-signature-changes.texidoc |    9 +
 ...ith-minimum-accidentals-smart-transpose.texidoc |   25 +
 .../it/texidocs/tweaking-clef-properties.texidoc   |   35 +
 Documentation/learning/fundamental.itely           |    2 +-
 Documentation/music-glossary.tely                  |    2 +-
 Documentation/nl/learning/fundamental.itely        |    2 +-
 Documentation/notation/changing-defaults.itely     |    8 +-
 Documentation/notation/fretted-strings.itely       |   34 +-
 Documentation/notation/input.itely                 |    2 +-
 Documentation/notation/simultaneous.itely          |   50 +-
 Documentation/po/cs.po                             | 6650 ++++++++----
 Documentation/po/de.po                             | 5588 ++++++----
 Documentation/po/es.po                             | 4382 ++++----
 Documentation/po/fr.po                             | 5685 +++++++----
 Documentation/po/hu.po                             | 5480 ++++++----
 Documentation/po/it.po                             | 5411 ++++++----
 Documentation/po/ja.po                             | 5423 ++++++----
 Documentation/po/lilypond-doc.pot                  |11512 +++++++++++++++++++-
 Documentation/po/nl.po                             | 5418 ++++++----
 Documentation/po/zh.po                             | 5429 ++++++----
 Documentation/snippets/adding-ambitus-per-voice.ly |   10 +
 .../adding-bar-lines-to-chordnames-context.ly      |    4 +-
 Documentation/snippets/adding-drum-parts.ly        |    2 +-
 .../snippets/adding-fingerings-to-tablatures.ly    |    2 +-
 .../adding-orchestral-cues-to-a-vocal-score.ly     |    2 +-
 .../snippets/adding-the-current-date-to-a-score.ly |    2 +-
 .../adding-volta-brackets-to-additional-staves.ly  |    2 +-
 ...aligning-marks-with-various-notation-objects.ly |    2 +-
 Documentation/snippets/alternative-breve-note.ly   |    2 +-
 .../snippets/ambitus-with-multiple-voices.ly       |   11 +
 ...e----modern-transcription-of-gregorian-music.ly |    2 +-
 ...te----modern-transcription-of-mensural-music.ly |    2 +-
 Documentation/snippets/anglican-psalm-template.ly  |    2 +-
 ...ad-styles-depending-on-the-step-of-the-scale.ly |   26 +-
 Documentation/snippets/arabic-improvisation.ly     |    2 +-
 .../snippets/beam-endings-in-score-context.ly      |    2 +-
 .../snippets/beam-grouping-in-7-8-time.ly          |    2 +-
 Documentation/snippets/beams-across-line-breaks.ly |    2 +-
 .../snippets/changing--flageolet-mark-size.ly      |    2 +-
 Documentation/snippets/changing-chord-separator.ly |    4 +-
 .../changing-form-of-multi-measure-rests.ly        |    2 +-
 .../snippets/changing-fret-orientations.ly         |    2 +-
 .../snippets/changing-partcombine-texts.ly         |    2 +-
 ...ng-text-and-spanner-styles-for-text-dynamics.ly |    2 +-
 Documentation/snippets/changing-the-ambitus-gap.ly |   10 +-
 ...ing-the-number-of-augmentation-dots-per-note.ly |    2 +-
 ...ng-the-positions-of-figured-bass-alterations.ly |    4 +-
 .../changing-the-size-of-woodwind-diagrams.ly      |    2 +-
 ...time-signature-without-affecting-the-beaming.ly |    2 +-
 .../snippets/chord-glissando-in-tablature.ly       |    2 +-
 Documentation/snippets/chord-name-exceptions.ly    |    4 +-
 Documentation/snippets/chord-name-major7.ly        |    4 +-
 .../snippets/chordchanges-for-fretboards.ly        |    2 +-
 .../combining-two-parts-on-the-same-staff.ly       |    2 +-
 Documentation/snippets/compound-time-signatures.ly |    2 +-
 .../conducting-signs,-measure-grouping-signs.ly    |    2 +-
 ...ontrolling-the-placement-of-chord-fingerings.ly |    2 +-
 ...controlling-the-vertical-ordering-of-scripts.ly |    2 +-
 .../controlling-tuplet-bracket-visibility.ly       |    2 +-
 ...g-arpeggios-across-notes-in-different-voices.ly |    2 +-
 .../snippets/customizing-markup-fret-diagrams.ly   |    2 +-
 ...-predefined-fretboards-for-other-instruments.ly |    2 +-
 ...accidentals-for-each-note-including-naturals.ly |    2 +-
 .../dynamics-custom-text-spanner-postfix.ly        |    2 +-
 .../snippets/dynamics-text-spanner-postfix.ly      |    2 +-
 .../fingering-symbols-for-wind-instruments.ly      |    2 +-
 ...tring-indications,-and-right-hand-fingerings.ly |    2 +-
 .../snippets/fretboards-alternate-tables.ly        |    2 +-
 Documentation/snippets/glissandi-can-skip-grobs.ly |    2 +-
 ...s-on-tied-notes-at-the-start-of-a-new-system.ly |   11 +-
 .../hiding-the-extender-line-for-text-dynamics.ly  |    2 +-
 Documentation/snippets/hymn-template.ly            |    2 +-
 Documentation/snippets/isolated-percent-repeats.ly |    2 +-
 .../snippets/lyrics-old-spacing-settings.ly        |    2 +-
 .../making-slurs-with-complex-dash-structure.ly    |    2 +-
 ...ing-some-staff-lines-thicker-than-the-others.ly |    2 +-
 ...rstriche-layout-bar-lines-between-the-staves.ly |    2 +-
 ...t-values-for-articulation-shorthand-notation.ly |    2 +-
 .../snippets/non-traditional-key-signatures.ly     |   27 +-
 .../snippets/numbers-as-easy-note-heads.ly         |   14 +-
 .../snippets/open-string-harmonics-in-tablature.ly |    2 +-
 Documentation/snippets/ottava-text.ly              |   14 +-
 .../snippets/partcombine-and-autobeamoff.ly        |    2 +-
 Documentation/snippets/percent-repeat-counter.ly   |    2 +-
 .../snippets/placement-of-right-hand-fingerings.ly |    2 +-
 Documentation/snippets/polyphony-in-tablature.ly   |    2 +-
 .../positioning-grace-notes-with-floating-space.ly |    2 +-
 .../snippets/positioning-multi-measure-rests.ly    |    2 +-
 ...xtra-naturals-from-being-automatically-added.ly |   13 +
 ...being-printed-when-the-key-signature-changes.ly |   14 +-
 ...ng-a-repeat-sign-at-the-beginning-of-a-piece.ly |    2 +-
 .../printing-bar-numbers-at-regular-intervals.ly   |    2 +-
 ...printing-bar-numbers-inside-boxes-or-circles.ly |    2 +-
 ...rinting-the-bar-number-for-the-first-measure.ly |    2 +-
 .../quoting-another-voice-with-transposition.ly    |    2 +-
 Documentation/snippets/quoting-another-voice.ly    |    2 +-
 .../snippets/satb-choir-template---four-staves.ly  |    2 +-
 .../setting-hairpin-behavior-at-bar-lines.ly       |    2 +-
 .../setting-the-double-repeat-default-for-volte.ly |    2 +-
 .../snippets/shortening-volta-brackets.ly          |    2 +-
 .../snippets/showing-chords-at-changes.ly          |    4 +-
 Documentation/snippets/simple-lead-sheet.ly        |    2 +-
 ...taff-template-with-notes,-lyrics,-and-chords.ly |    2 +-
 .../single-staff-template-with-notes-and-chords.ly |    2 +-
 .../single-staff-template-with-notes-and-lyrics.ly |    2 +-
 .../single-staff-template-with-only-notes.ly       |    2 +-
 Documentation/snippets/slides-in-tablature.ly      |    2 +-
 .../stem-and-beam-behavior-in-tablature.ly         |    2 +-
 .../string-quartet-template-with-separate-parts.ly |    2 +-
 Documentation/snippets/subdividing-beams.ly        |    2 +-
 ...umerator-as-a-number-instead-of-the-fraction.ly |    2 +-
 ...hes-with-minimum-accidentals-smart-transpose.ly |   30 +-
 Documentation/snippets/tweaking-clef-properties.ly |   40 +-
 ...-arpeggiobracket-to-make-divisi-more-visible.ly |    2 +-
 .../using-double-slurs-for-legato-chords.ly        |    2 +-
 .../using-grace-note-slashes-with-normal-heads.ly  |    2 +-
 ...mble-template-with-automatic-piano-reduction.ly |    2 +-
 ...cal-ensemble-template-with-verse-and-refrain.ly |    2 +-
 Documentation/snippets/volta-below-chords.ly       |    4 +-
 input/regression/chord-repetition-times.ly         |   15 +
 input/regression/cue-clef.ly                       |    2 +-
 input/regression/display-lily-tests.ly             |    2 +-
 .../tablature-chord-repetition-finger.ly           |   28 +
 input/regression/tablature-chord-repetition.ly     |    6 +-
 lily/dynamic-engraver.cc                           |    2 +-
 lily/include/lily-lexer.hh                         |   16 -
 lily/include/music-sequence.hh                     |    2 +-
 lily/lexer.ll                                      |    8 +-
 lily/lily-lexer.cc                                 |    2 -
 lily/lily-parser-scheme.cc                         |   26 -
 lily/music-sequence.cc                             |   72 +-
 lily/parser.yy                                     |   25 +-
 ly/chord-repetition-init.ly                        |  112 +-
 ly/music-functions-init.ly                         |    8 -
 python/musicexp.py                                 |    2 +-
 scm/define-music-display-methods.scm               |   73 +-
 scm/define-music-types.scm                         |   11 +-
 scm/ly-syntax-constructors.scm                     |    8 +-
 scm/music-functions.scm                            |   77 +-
 171 files changed, 48365 insertions(+), 18581 deletions(-)
 create mode 100644 Documentation/it/notation.tely
 create mode 100644 Documentation/it/notation/GNUmakefile
 create mode 100644 Documentation/it/notation/notation.itely
 create mode 100644 Documentation/it/notation/pitches.itely
 create mode 100644 Documentation/it/texidocs/adding-ambitus-per-voice.texidoc
 create mode 100644 
Documentation/it/texidocs/ambitus-with-multiple-voices.texidoc
 create mode 100644 
Documentation/it/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
 create mode 100644 Documentation/it/texidocs/changing-the-ambitus-gap.texidoc
 create mode 100644 
Documentation/it/texidocs/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.texidoc
 create mode 100644 
Documentation/it/texidocs/non-traditional-key-signatures.texidoc
 create mode 100644 Documentation/it/texidocs/numbers-as-easy-note-heads.texidoc
 create mode 100644 Documentation/it/texidocs/ottava-text.texidoc
 create mode 100644 
Documentation/it/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
 create mode 100644 
Documentation/it/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
 create mode 100644 
Documentation/it/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
 create mode 100644 Documentation/it/texidocs/tweaking-clef-properties.texidoc
 create mode 100644 input/regression/chord-repetition-times.ly
 create mode 100644 input/regression/tablature-chord-repetition-finger.ly


-- 
David Kastrup