[Top][All Lists]
[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: |
Thu, 08 Mar 2012 01:20:05 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
James <address@hidden> writes:
> Hello,
>
> On 8 March 2012 00:04, David Kastrup <address@hidden> wrote:
> ...
>> Huh? Why pause? I wrote "hopefully master soon". Just let the beast
>> run as scheduled.
>
> This is what it reports as it started (just FYI)
>
> --snip--
>
> emote: Counting objects: 272, done.
> remote: Compressing objects: 100% (30/30), done.
> remote: Total 169 (delta 139), reused 169 (delta 139)
> Receiving objects: 100% (169/169), 21.91 KiB, done.
> Resolving deltas: 100% (139/139), completed with 79 local objects.
> From ssh://git.sv.gnu.org/srv/git/lilypond
> * [new branch] dev/staging -> origin/dev/staging
> * [new branch] dev/translation -> origin/dev/translation
> 32b9cd0..5697144 lilypond/translation -> origin/lilypond/translation
> 9d1520b..2944a83 staging -> origin/staging
> Branch test-master-lock set up to track remote branch master from origin.
> Branch test-staging set up to track remote branch staging from origin.
> Initialized empty Git repository in /home/james/lilypond-git/build/.git/
> Updating 9d1520b..2944a83
> Fast-forward
> Documentation/contributor/introduction.itexi | 4 +-
> Documentation/contributor/lsr-work.itexi | 25 +++
> Documentation/de/notation/spacing.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/web/community.itexi | 6 +-
> GNUmakefile.in | 5 +-
> input/regression/autobeam-3-4-rules.ly | 24 +++
> input/regression/multiple-time-sig-settings.ly | 4 +-
> input/regression/rest-on-nonstandard-staff.ly | 5 +
> lily/book-scheme.cc | 4 +
> lily/parser.yy | 2 -
> lily/rest.cc | 31 ++-
> 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 +-
> 48 files changed, 315 insertions(+), 381 deletions(-)
> create mode 100644 input/regression/autobeam-3-4-rules.ly
> delete mode 100644 scripts/build/mutopia-index.py
> Total 0 (delta 0), reused 0 (delta 0)
> To /home/james/lilypond-git/
> 9d1520b..2944a83 test-master-lock -> test-master-lock
>
Quite as expected. It has a _lot_ of damage to undo from that merge
commit.
I have checked the versions, and it would appear that once translation
has been checked _and_ the new master merged into it _and_ back into
staging again, the Bug Squad will need to reverify all issues with
Fixed_2_15_31 or later _textually_ (meaning that they need to check that
the changes are in the work tree, not that the commit is in the history:
the commits will be there several times under different commit ids, and
some of the commit history is a lie).
Yes, that's annoying. But it would be even more annoying if we failed
to notice that fixes disappeared.
--
David Kastrup
- Re: Bad translation merge, (continued)
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Janek Warchoł, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, Janek Warchoł, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, James, 2012/03/07
- Re: Bad translation merge, David Kastrup, 2012/03/07
- Re: Bad translation merge, James, 2012/03/07
- Re: Bad translation merge, James, 2012/03/07
- Re: Bad translation merge,
David Kastrup <=
- Re: Bad translation merge, David Kastrup, 2012/03/07