lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Bad translation merge


From: David Kastrup
Subject: Re: Bad translation merge
Date: Wed, 07 Mar 2012 17:06:43 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux)

Jean-Charles Malahieude <address@hidden> writes:

> Le 07/03/2012 15:29, David Kastrup disait :
>>
>> I see rebasing commits like
>>
>> commit 24f5f986998c23a1cbac15024d58ca6497093cce
>> Author: Julien Rioux<address@hidden>
>> Commit: Francisco Vila<address@hidden>
>>
>>      Doc-de: Compilation fix for de/notation.
>>
>> commit 12cfe6bafb8589b0780df84fb36981994ee8793a
>> Author: Till Paala<address@hidden>
>> Commit: Francisco Vila<address@hidden>
>>
>>      Doc-de: update the noation manual, adding snippet translations
>>
>> which also appear in a version committed by their actual authors.
>> That's definitely not good.  But I don't see how this would explain the
>> _loss_ of changes.  Digging further.
>>
>
> I don't know if this can help, but I see many "doubled commits" in
> gitk, like

Well yes, but the changes they introduce would not undo other changes.
If I look at the "symmetric" difference of the parents of our current
master merge, I see
git log --stat --graph --source --date-order 744709d...ab45be2
* commit 744709d5ce7c67890c5c79f359f885a09cc26f27       744709d...ab45be2
| Author: Jan-Peter Voigt <address@hidden>
| Date:   Fri Mar 2 09:54:20 2012 +0100
| 
|     add ly:book-set-header!
|     
|     Add a scheme function ly:book-set-header! like ly:score-set-header!
|     
|     Function is copied from score-scheme.cc to book-scheme.cc,
|     setting public member var header_ in class Book.
| 
|  lily/book-scheme.cc |   13 +++++++++++++
|  1 files changed, 13 insertions(+), 0 deletions(-)
|  
* commit 2ccfd5a9f83819be67877522aeae7212fde3fefd       744709d...ab45be2
| Author: Mike Solomon <address@hidden>
| Date:   Wed Mar 7 08:19:42 2012 +0100
| 
|     Prevents segfault in Span_bar_stub_engraver through derived_mark.
|     
|     Makes sure that used contexts are not garbage collected and removes
|     of those that are from the axis_groups_ alist.
| 
|  lily/span-bar-stub-engraver.cc |   77 
++++++++++++++++++++++++++++++++--------
|  1 files changed, 62 insertions(+), 15 deletions(-)
|  
* commit cc5223ac26a5713c5901c02edf2868c26be10542       744709d...ab45be2
| Author: Janek Warchoł <address@hidden>
| Date:   Tue Mar 6 17:09:53 2012 +0100
| 
|     Web: add GSoC ideas list
|     
|     A list of suggested projects for Google Summer of Code
|     students is necessary to participate in the program.
| 
|  Documentation/lilypond-texi2html.init |    2 +-
|  Documentation/web/community.itexi     |  199 
+++++++++++++++++++++++++++++++++
|  2 files changed, 200 insertions(+), 1 deletions(-)
|    
| * commit ab45be2f0dd1b5eece042934682039ec4e99b271     ab45be2
| | Author: Jean-Charles Malahieude <address@hidden>
| | Date:   Tue Mar 6 17:14:41 2012 +0100
| | 
| |     Doc-fr: enable Extending
| |       * master file
| |       * Scheme tutorial (first delivery)
| |       * programming interface (re-enable old material & update skeleton)
| | 
| |  Documentation/fr/extending.tely                    |   78 +
| |  .../fr/extending/programming-interface.itely       |  345 +++--
| |  Documentation/fr/extending/scheme-tutorial.itely   | 1649 
++++++++++++++++++++
| |  3 files changed, 1924 insertions(+), 148 deletions(-)
| |   
* | commit 2bba3b65d5150ec62dda869bdb3a152b21a03504     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Tue Mar 6 01:20:23 2012 +0100
| | 
| |     Fix Issue 2380: formatting of lyrics, \versus and \respondum
| | 
| |  ly/gregorian.ly |   34 ++++++++++++----------------------
| |  1 files changed, 12 insertions(+), 22 deletions(-)
| |   
* | commit 308c694ab361de67e261f5efa7b7e652dd4cf081     744709d...ab45be2
| | Author: Valentin Villenave <address@hidden>
| | Date:   Tue Mar 6 00:16:45 2012 +0100
| | 
| |     Web: Announcement update for the new "LilyPond Report"
| |     
| |     I'm keeping more than three items on the front page
| |     so there's at least one Release Candidate still
| |     mentioned.
| | 
| |  Documentation/web/news-front.itexi |   19 ++++++++++++++++---
| |  Documentation/web/news.itexi       |    2 +-
| |  2 files changed, 17 insertions(+), 4 deletions(-)
| |   
* | commit fe2e679d876eba72077a9ced1b918ad330e79bb4     744709d...ab45be2
| | Author: Reinhold Kainhofer <address@hidden>
| | Date:   Mon Mar 5 17:05:51 2012 +0000
| | 
| |     Make extract-texi-filenames ignore comments
| | 
| |  scripts/build/extract_texi_filenames.py |    3 ++-
| |  1 files changed, 2 insertions(+), 1 deletions(-)
| |   
* | commit 418adb3cf974523a481a7b92975bea16e8b43472     744709d...ab45be2
| | Author: Graham Percival <address@hidden>
| | Date:   Mon Mar 5 12:53:58 2012 +0000
| | 
| |     Release: bump version.
| | 
| |  VERSION |    4 ++--
| |  1 files changed, 2 insertions(+), 2 deletions(-)
| |   
| * commit 3c62ac104645533873bba800f7b0f371089f535a     ab45be2
| | Author: Yoshiki Sawada <address@hidden>
| | Date:   Sun Mar 4 15:54:54 2012 +0900
| | 
| |     Doc-ja: update LM and NR
| |     
| |     Doc-ja: update files of LM and NR and their committishes.
| | 
| |  Documentation/ja/learning.tely             |    2 +-
| |  Documentation/ja/learning/templates.itely  |    3 +-
| |  Documentation/ja/learning/tweaks.itely     |  294 +++++++++-----------
| |  Documentation/ja/notation.tely             |    4 +-
| |  Documentation/ja/notation/percussion.itely |    2 +-
| |  Documentation/ja/notation/pitches.itely    |   82 +++---
| |  Documentation/ja/notation/rhythms.itely    |  414 
++++++++++++++++++++--------
| |  Documentation/ja/notation/wind.itely       |    2 +-
| |  8 files changed, 473 insertions(+), 330 deletions(-)
| |     
* |   commit 273e6b790c915192dc71bbc2ba1c077b98034468   744709d...ab45be2
|\ \  Merge: 7186f20 acb4ce2
| | | Author: Graham Percival <address@hidden>
| | | Date:   Sun Mar 4 23:37:18 2012 +0000
| | | 
| | |     Merge remote branch 'origin' into release/unstable
| | |    
* | | commit 7186f2025b9c853fe90589cb6aaf9bd04a9eb244   744709d...ab45be2
| | | Author: Graham Percival <address@hidden>
| | | Date:   Sat Mar 3 16:24:01 2012 +0000
| | | 
| | |     Release: update news.
| | | 
| | |  Documentation/web/news-front.itexi |   14 ++++++++++++++
| | |  1 files changed, 14 insertions(+), 0 deletions(-)
| | |    
| * | commit acb4ce2a0927ae1899752c991d1c843f5b01196e   744709d...ab45be2
| | | Author: Graham Percival <address@hidden>
| | | Date:   Sat Mar 3 14:26:06 2012 +0000
| | | 
| | |     Web: encourage users to comment on existing bugs
| | | 
| | |  Documentation/web/community.itexi |    5 +++--
| | |  1 files changed, 3 insertions(+), 2 deletions(-)
| | |    
| * | commit 060006b3bae5d27a7c280751c8dba2350c576fa0   744709d...ab45be2
|/ /  Author: David Kastrup <address@hidden>
| |   Date:   Sat Mar 3 14:09:27 2012 +0100
| |   
| |       dispatcher.cc: fix type mismatch error in Dispatcher::print_smob
| |   
| |    lily/dispatcher.cc |    3 ++-
| |    1 files changed, 2 insertions(+), 1 deletions(-)
| |   
* | commit 75195f1420ec4730bf220364116394104b711b0a     744709d...ab45be2
| | Author: Janek Warchoł <address@hidden>
| | Date:   Wed Feb 8 15:49:13 2012 +0100
| | 
| |     CG: a note about articulations on EventChord
| |     
| |     Explains a bit about iterators.
| | 
| |  Documentation/contributor/programming-work.itexi |   31 
++++++++++++++++++++++
| |  1 files changed, 31 insertions(+), 0 deletions(-)
| |   
* | commit d1141b3e90d6ae768f9349806a1e33f1026d90aa     744709d...ab45be2
| | Author: Janek Warchoł <address@hidden>
| | Date:   Tue Feb 14 09:42:58 2012 +0100
| | 
| |     web: rephrase bugreports section
| |     
| |     According to Graham's favorite rule ("perfection is attained
| |     when there's nothing more to delete") i'm rephrasing bugreports
| |     section hoping to make it even more brief and straightforward
| |     for all users.
| | 
| |  Documentation/web/community.itexi |   38 
++++++++++++++++++++----------------
| |  1 files changed, 21 insertions(+), 17 deletions(-)
| |   
* | commit 1551dd6bf65c0236b9620ee966599f5d811d77d8     744709d...ab45be2
| | Author: Jean-Charles Malahieude <address@hidden>
| | Date:   Fri Mar 2 19:50:45 2012 +0100
| | 
| |     Doc: typo in Scheme-tutorial
| | 
| |  Documentation/extending/scheme-tutorial.itely |    2 +-
| |  1 files changed, 1 insertions(+), 1 deletions(-)
| |   
| * commit dadabdfc4537ef85adb9159d46eda5a0ff180835     ab45be2
| | Author: Till Paala <address@hidden>
| | Date:   Fri Mar 2 19:55:19 2012 +0200
| | 
| |     Doc-de: updates to usage manual
| | 
| |  Documentation/de/usage.tely                |    2 +-
| |  Documentation/de/usage/external.itely      |  104 +++++++++++-
| |  Documentation/de/usage/lilypond-book.itely |  217 +++++++++++++++++++------
| |  Documentation/de/usage/running.itely       |  242 
++++++++++++++++++----------
| |  Documentation/de/usage/updating.itely      |   12 +-
| |  5 files changed, 426 insertions(+), 151 deletions(-)
| |   
| * commit 17bce3f70d2886ed98fac5c90dd7f8fa065b546b     ab45be2
| | Author: Till Paala <address@hidden>
| | Date:   Fri Mar 2 19:55:06 2012 +0200
| | 
| |     Doc-de: update search-box
| | 
| |  Documentation/de/search-box.ihtml |   15 +++++++++++----
| |  1 files changed, 11 insertions(+), 4 deletions(-)
| |   
* | commit 4079fa56584085e01822132f968b47c71d7c932e     744709d...ab45be2
| | Author: Julien Rioux <address@hidden>
| | Date:   Fri Mar 2 17:55:24 2012 +0100
| | 
| |     [configure] Properly recognize `guile1' binary.
| | 
| |  stepmake/aclocal.m4 |    2 +-
| |  1 files changed, 1 insertions(+), 1 deletions(-)
| |   
* | commit f174bb0d28a5f8b6ca28e2e38930cba6e2e0d0ae     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Fri Mar 2 16:12:55 2012 +0100
| | 
| |     Some manual documentation changes in the wake of allowing music in 
output defs
| | 
| |  Documentation/changes.tely         |   11 +++++++++++
| |  Documentation/notation/input.itely |   15 +++++----------
| |  2 files changed, 16 insertions(+), 10 deletions(-)
| |   
* | commit 4f74dce083e6e0b63047dd61dfd8770965362381     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Thu Mar 1 00:24:30 2012 +0100
| | 
| |     Revert "Add layout changing command \layout-from for getting context 
defs from music"
| |     
| |     This reverts commit dd7a75b0862bf05adec8033a1c4a15f225255101.
| |     
| |     \layout-from has been made redundant.  Its regtest is kept, adapted
| |     to the new realities.
| | 
| |  input/regression/layout-from.ly |   12 +++---
| |  ly/context-mods-init.ly         |   77 
+--------------------------------------
| |  2 files changed, 7 insertions(+), 82 deletions(-)
| |   
* | commit 7c3242c2474c98f8ec96c0de0b05066e5f0ef248     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Wed Feb 29 22:07:43 2012 +0100
| | 
| |     Run scripts/auxiliar/update-with-convert-ly.py
| | 
| |  Documentation/de/essay/engraving.itely             |    7 ++-----
| |  Documentation/de/notation/input.itely              |   17 ++++-------------
| |  Documentation/es/essay/engraving.itely             |    7 ++-----
| |  Documentation/es/notation/input.itely              |   17 ++++-------------
| |  Documentation/essay/engraving.itely                |    7 ++-----
| |  Documentation/fr/essay/engraving.itely             |    7 ++-----
| |  Documentation/fr/notation/input.itely              |   17 ++++-------------
| |  Documentation/ja/notation/input.itely              |   17 ++++-------------
| |  Documentation/ly-examples/granados.ly              |    7 ++-----
| |  Documentation/ly-examples/theory.ly                |    7 ++-----
| |  Documentation/notation/input.itely                 |   17 ++++-------------
| |  Documentation/snippets/adding-drum-parts.ly        |    7 ++-----
| |  ...hanging-midi-output-to-one-channel-per-voice.ly |    7 ++-----
| |  Documentation/snippets/new/screech-boink.ly        |    7 ++-----
| |  Documentation/snippets/new/staff-headword.ly       |    7 ++-----
| |  Documentation/snippets/screech-boink.ly            |    7 ++-----
| |  Documentation/snippets/staff-headword.ly           |    7 ++-----
| |  input/regression/baerenreiter-sarabande.ly         |    7 ++-----
| |  input/regression/drums.ly                          |    7 ++-----
| |  input/regression/midi-volume-equaliser.ly          |    7 ++-----
| |  input/regression/morgenlied.ly                     |    7 ++-----
| |  input/regression/mozart-hrn-3.ly                   |   17 ++++-------------
| |  input/regression/typography-demo.ly                |    7 ++-----
| |  23 files changed, 58 insertions(+), 163 deletions(-)
| |   
* | commit b9fb4e8a90b8d95ba7df21c8e09a90e4207c2bc9     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Wed Feb 29 18:02:50 2012 +0100
| | 
| |     convertrules.py: tempoWholesPerMinute -> \tempo
| | 
| |  python/convertrules.py |   27 +++++++++++++++++++++++++++
| |  1 files changed, 27 insertions(+), 0 deletions(-)
| |   
* | commit e995ed461610c2bb9c9cd43eaa715905b8525b95     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Sun Feb 26 19:16:00 2012 +0100
| | 
| |     Allow music with layout instructions in output definitions.
| |     
| |     This allows things like
| |     
| |       \layout { \accidentalStyle modern }
| |     
| |     or
| |     
| |       \midi { \tempo 4 = 80 }
| |     
| |     to work as intended.
| | 
| |  lily/context-def.cc         |   65 
+++++++++++++++++++++++++++++++++++++++++-
| |  lily/include/context-def.hh |    1 +
| |  lily/parser.yy              |    4 ++
| |  ly/declarations-init.ly     |    1 +
| |  scm/lily-library.scm        |   65 
+++++++++++++++++++++++++++++++++++++++++++
| |  5 files changed, 134 insertions(+), 2 deletions(-)
| |   
* | commit 21c9f487462d40436299a4e3a1e3289a1bc4bf15     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Mon Feb 27 13:57:49 2012 +0100
| | 
| |     Don't use Bottom overrides in \tabFullNotation
| | 
| |  ly/property-init.ly |    4 ++--
| |  1 files changed, 2 insertions(+), 2 deletions(-)
| |   
* | commit bcb923013b683b80cde600a3c38c737c6830593b     744709d...ab45be2
| | Author: David Kastrup <address@hidden>
| | Date:   Mon Feb 27 11:57:45 2012 +0100
| | 
| |     Issue 2360: Scheme sandbox fails to load readline module
| | 
| |  Documentation/extending/scheme-tutorial.itely |    7 ++++++-
| |  ly/scheme-sandbox.ly                          |   15 +++++++++++++--
| |  2 files changed, 19 insertions(+), 3 deletions(-)
| |   
* | commit 984b59eda4c1dded74567bc9eedcce2ba2ed0eb5     744709d...ab45be2
| | Author: Mike Solomon <address@hidden>
| | Date:   Fri Mar 2 07:46:49 2012 +0100
| | 
| |     Makes changes in .ly files for transparency
| | 
| |  ly/engraver-init.ly |   12 ++++++------
| |  ly/property-init.ly |   12 ++++++------
| |  2 files changed, 12 insertions(+), 12 deletions(-)
| |   
* | commit 88a8754b318a85ae19ec0c566530b898f4331197     744709d...ab45be2
| | Author: Mike Solomon <address@hidden>
| | Date:   Fri Mar 2 07:44:51 2012 +0100
| | 
| |     Changes transparent grobs to false stencils in TabVoice
| | 
| |  lily/self-alignment-interface.cc |    4 +---
| |  1 files changed, 1 insertions(+), 3 deletions(-)
| |   
* | commit 90ee61d5b681295b8b401128ca9bc48554eee66a     744709d...ab45be2
| | Author: Janek Warchoł <address@hidden>
| | Date:   Tue Feb 14 11:31:59 2012 +0100
| | 
| |     CG: add information about Regtest Checking Project
| |     
| |     Phil Holmes wrote a nice web app that allows people to
| |     review regtests, one at a time.  We can ask users for
| |     help and thus painlessly do a full regtest check.
| |     This commit contains brief instructions how to use the app.
| | 
| |  Documentation/contributor/regressions.itexi |   44 
+++++++++++++++++++++++++++
| |  1 files changed, 44 insertions(+), 0 deletions(-)
| |   
* | commit 2d276844d7c20dd5838f9764d0eae37f53bebab3     744709d...ab45be2
| | Author: Marc Hohl <address@hidden>
| | Date:   Fri Feb 17 09:59:58 2012 +0100
| | 
| |     Improving \harmonicBy... functions
| |     
| |     These functions work now as expected for guitar music.
| |     We have dotted harmonics and mixed harmonic note heads.
| | 
| |  ly/music-functions-init.ly |   62 
++++++++++++++++++++++++--------------------
| |  1 files changed, 34 insertions(+), 28 deletions(-)
| |   
| * commit 17183f4a9696f2187128490a669895964959fa84     ab45be2
|   Merge: caa20be feb3b8d
|   Author: Francisco Vila <address@hidden>
|   Date:   Thu Mar 1 15:38:35 2012 +0100
|   
|       Merge branch 'master' into lilypond/translation
|  
* commit 3597c42fcb4f0a112fa80547c0bd33cd58eeea13       744709d...ab45be2
| Author: Francisco Vila <address@hidden>
| Date:   Thu Mar 1 14:50:19 2012 +0100
| 
|     Doc: update translation status.
| 
|  .../contributor/doc-translation-list.itexi         |    6 +-
|  Documentation/cs/translations.itexi                |    2 +-
|  Documentation/de/translations.itexi                |    4 +-
|  Documentation/es/translations.itexi                |   12 +-
|  Documentation/fr/translations.itexi                |   22 +-
|  Documentation/hu/translations.itexi                |    2 +-
|  Documentation/it/translations.itexi                |    2 +-
|  Documentation/ja/translations.itexi                |   12 +-
|  Documentation/nl/translations.itexi                |    2 +-
|  Documentation/translations.itexi                   |  196 
++++++++------------
|  Documentation/zh/translations.itexi                |    2 +-
|  11 files changed, 111 insertions(+), 151 deletions(-)
|  
* commit e885a8cabc8335f1c46c48e92d4048e9d258cd10       744709d...ab45be2
  Merge: feb3b8d caa20be
  Author: Francisco Vila <address@hidden>
  Date:   Thu Mar 1 13:59:42 2012 +0100
  
      Merge branch 'lilypond/translation' into staging


That all looks normalized.  The duplicate commits are weeded out, and we
have the two starting merges (starting from the same two commits)

| * commit 17183f4a9696f2187128490a669895964959fa84     ab45be2
|   Merge: caa20be feb3b8d
|   Author: Francisco Vila <address@hidden>
|   Date:   Thu Mar 1 15:38:35 2012 +0100
|   
|       Merge branch 'master' into lilypond/translation

and
* commit e885a8cabc8335f1c46c48e92d4048e9d258cd10       744709d...ab45be2
  Merge: feb3b8d caa20be
  Author: Francisco Vila <address@hidden>
  Date:   Thu Mar 1 13:59:42 2012 +0100
  
      Merge branch 'lilypond/translation' into staging

If we look at their difference, we see that while they start from the
exact same two parent commits (just in a different order), they arrive
at staggeringly different results:
git diff --stat 17183f4a9696f2187128490a669895964959fa84 
e885a8cabc8335f1c46c48e92d4048e9d258cd10
 Documentation/changes.tely                         |    8 +
 Documentation/contributor/introduction.itexi       |    4 +-
 Documentation/contributor/lsr-work.itexi           |   25 +++
 Documentation/included/helpus.itexi                |   11 +-
 Documentation/ly-examples/GNUmakefile              |    2 +-
 Documentation/notation/rhythms.itely               |   30 +++-
 ...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        |    9 +
 Documentation/snippets/hymn-template.ly            |    1 +
 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 +-
 .../snippets/woodwind-diagrams-key-lists.ly        |    2 +-
 Documentation/translations.itexi                   |  186 +++++++++++-------
 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 +-
 49 files changed, 549 insertions(+), 448 deletions(-)

It turns out that 17183f is not actually a merge regarding the trees.
Instead it is an exact copy of caa20be.  That is something that happens
when specifying a non-standard merge strategy.  Or there was something
else that went wrong that made git think that caa20be was everything
that it needed.

So
| * commit 17183f4a9696f2187128490a669895964959fa84     ab45be2
|   Merge: caa20be feb3b8d
|   Author: Francisco Vila <address@hidden>
|   Date:   Thu Mar 1 15:38:35 2012 +0100
|   
|       Merge branch 'master' into lilypond/translation

_thinks_ it merged master (feb3b8d at that point of time) into the
translation tree and tells git that it did so.  The other merge commit
claims the same, and git reconciles those conflicting claims in a manner
that wreaks havoc.  I'll see whether I can get this fixed up.  The
problem is that we can't just revert the last merge we have at master:
that essentially dials everything back to the state before the merge,
except that git keeps thinking that everything that should ever come
from the translation branch has already arrived, and will not
reintegrate it next time.

-- 
David Kastrup



reply via email to

[Prev in Thread] Current Thread [Next in Thread]