[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: Wed, 07 Mar 2012 15:29:54 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux)

Julien Rioux <address@hidden> writes:

> David Kastrup <dak <at>> writes:
>> 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 don't know if this can help you, but I noticed the following. Usually
> master is merged into lilypond/translation and then lilypond/translation
> is merged into master.

It should be merged into _staging_ (which will eventually pass into
master).  I don't remember any chaos with regard to staging->master, so
tampering with master was not likely a problem.

> If you look at the history about 11 days ago, you can see that master
> was merged into lilypond/translation, so far so good, but then it
> looks like lilypond/translation~0 was rebased on top of master,
> instead of merged into master.

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.

David Kastrup

reply via email to

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