[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 00:42:35 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux)

David Kastrup <address@hidden> writes:

> Well, "somebody" will likely be me, of course.  Sleep is overrated.
> make check is not all that slow, and I can leave the full doc build to
> Patchy (assuming he is still on regular duty: there is actually no
> reason why he shouldn't be).  That leaves the translations.  Now we
> can reset them if needed, but I prefer not to do that since rewinding
> published history is a nuisance, and I don't really want to force the
> translators to mess more with their repositories than necessary.  I
> suppose I'll push that thing shortly and hope for the best.

I pushed both the translation branch as well as staging.  The fixed
translation branch is merged into staging, but I have not merged staging
(hopefully master soon: I think midnight GMT is in 20 minutes, and that
should trigger James' patchy) back into translation.

Translators should first check that lilypond/translation is in a
consistent state (I am doubtful about the committishes).  Once it is
considered fine, one can merge the (hopefully) new master back, and the
two should be reasonably synced again.

David Kastrup

reply via email to

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