Re: Bad translation merge

[David Kastrup]

David Kastrup <address@hidden> writes:

> David Kastrup <address@hidden> writes:
>
>> Hi, the recent translation merge apparently made some wrong choices when
>> dealing with merge conflicts.  Changes in staging have been overwritten
>> in the following files:
>
>> And that affects a lot more than just translations.  I have removed that
>> commit from origin/staging, and we'll have to investigate what
>> happened.  Francisco, do you remember the commands you used for merging
>> translation into staging?  I'll try repeating this on my own and see
>> whether I can reproduce this.
>
> I can reproduce the problems when merging.  It would appear that the
> history of the translation branch got messed up at some point of time in
> a manner that git can't recognize how to merge properly anymore.
>
> I will try to figure out what happened here.  Please don't merge the
> translation branch to staging while I try figuring this out.

Ok, here is a merge from master into translations that causes a large
loss of functionality as opposed to its purportedly merged parent
commit.  Unfortunately, not just outside of Documentation, but also
inside.  Weird.  Looking further.

git diff --stat feb3b8d..17183f4a9696f2187128490a669895964959fa84
 Documentation/changes.tely                         |    8 -
 Documentation/contributor/introduction.itexi       |    4 +-
 Documentation/contributor/lsr-work.itexi           |   25 ---
 Documentation/de/essay.tely                        |    2 +-
 Documentation/de/extending.tely                    |    2 +-
 Documentation/de/learning.tely                     |    2 +-
 Documentation/de/learning/common-notation.itely    |    2 +-
 Documentation/de/learning/fundamental.itely        |    2 +-
 Documentation/de/learning/templates.itely          |    2 +-
 Documentation/de/learning/tweaks.itely             |    2 +-
 Documentation/de/notation.tely                     |    2 +-
 Documentation/de/notation/changing-defaults.itely  |    2 +-
 Documentation/de/notation/expressive.itely         |    2 +-
 Documentation/de/notation/fretted-strings.itely    |    2 +-
 Documentation/de/notation/input.itely              |    2 +-
 Documentation/de/notation/pitches.itely            |    2 +-
 Documentation/de/notation/repeats.itely            |    2 +-
 Documentation/de/notation/rhythms.itely            |    2 +-
 Documentation/de/notation/simultaneous.itely       |    2 +-
 Documentation/de/notation/spacing.itely            |    2 +-
 Documentation/de/notation/staff.itely              |    2 +-
 Documentation/de/notation/text.itely               |    2 +-
 Documentation/de/notation/vocal.itely              |    2 +-
 Documentation/de/notation/wind.itely               |    2 +-
 Documentation/de/notation/world.itely              |    2 +-
 Documentation/de/translations.itexi                |  136 +++++++-------
 Documentation/de/web.texi                          |    2 +-
 Documentation/de/web/community.itexi               |    2 +-
 Documentation/de/web/download.itexi                |    2 +-
 Documentation/de/web/introduction.itexi            |    2 +-
 Documentation/de/web/manuals.itexi                 |    2 +-
 Documentation/es/notation/percussion.itely         |    2 +-
 Documentation/es/notation/spacing.itely            |    9 +-
 Documentation/es/notation/staff.itely              |    2 +-
 Documentation/fr/included/helpus.itexi             |   70 ++++----
 Documentation/fr/notation/changing-defaults.itely  |  172 ++++++++++++++---
 Documentation/fr/notation/input.itely              |    2 +-
 .../fr/notation/notation-appendices.itely          |   14 ++-
 Documentation/fr/notation/percussion.itely         |    2 +-
 Documentation/fr/notation/spacing.itely            |    7 +-
 Documentation/fr/notation/wind.itely               |    2 +-
 Documentation/included/helpus.itexi                |   11 +-
 Documentation/ly-examples/GNUmakefile              |    2 +-
 Documentation/notation/rhythms.itely               |   30 +---
 .../snippets/alternative-bar-numbering.ly          |    2 +-
 Documentation/snippets/alternative-breve-note.ly   |    2 +-
 ...centering-markup-on-note-heads-automatically.ly |   44 +++--
 .../creating-metronome-marks-in-markup-mode.ly     |    2 +-
 .../customizing-fretboard-fret-diagrams.ly         |    6 +-
 ...ining-an-engraver-in-scheme-ambitus-engraver.ly |   45 +++--
 ...play-bracket-with-only-one-staff-in-a-system.ly |    2 +-
 .../snippets/formatting-lyrics-syllables.ly        |    7 +-
 Documentation/snippets/glissandi-can-skip-grobs.ly |    2 +-
 Documentation/snippets/hymn-template.ly            |    1 -
 .../snippets/lyrics-old-spacing-settings.ly        |    2 +-
 Documentation/snippets/nesting-staves.ly           |    2 +-
 .../snippets/numbers-as-easy-note-heads.ly         |   32 ++--
 .../snippets/partcombine-and-autobeamoff.ly        |    2 -
 .../snippets/placement-of-right-hand-fingerings.ly |    4 +-
 .../snippets/printing-marks-on-every-staff.ly      |    2 +-
 ...etronome-and-rehearsal-marks-below-the-staff.ly |    2 +-
 Documentation/snippets/strict-beat-beaming.ly      |    2 +-
 .../snippets/woodwind-diagrams-key-lists.ly        |    2 +-
 Documentation/translations.itexi                   |  128 +++++++-------
 Documentation/web/community.itexi                  |    6 +-
 Documentation/web/news-front.itexi                 |   14 --
 GNUmakefile.in                                     |    5 +-
 VERSION                                            |    4 +-
 input/regression/autobeam-3-4-rules.ly             |   24 ---
 input/regression/layout-from.ly                    |   19 --
 input/regression/multiple-time-sig-settings.ly     |    4 +-
 input/regression/rest-on-nonstandard-staff.ly      |    5 -
 lily/book-scheme.cc                                |    4 -
 lily/context-def.cc                                |    3 -
 lily/parser.yy                                     |    2 +
 lily/rest.cc                                       |   31 +--
 ly/context-mods-init.ly                            |   77 +--------
 ly/engraver-init.ly                                |    7 +-
 ly/event-listener.ly                               |   26 ++--
 ly/init.ly                                         |    2 +
 ly/music-functions-init.ly                         |    8 +-
 make/lilypond-book-vars.make                       |    2 +-
 make/ly-rules.make                                 |    2 +-
 make/midi-rules.make                               |    2 +-
 ps/music-drawing-routines.ps                       |   21 +--
 scm/auto-beam.scm                                  |   48 +----
 scm/define-context-properties.scm                  |    4 -
 scm/lily-library.scm                               |   34 +---
 scm/lily.scm                                       |    4 +-
 scm/time-signature-settings.scm                    |   17 +-
 scripts/build/mutopia-index.py                     |  197 ++++++++++++++++++++
 stepmake/stepmake/texinfo-rules.make               |    4 +-
 92 files changed, 749 insertions(+), 670 deletions(-)


-- 
David Kastrup