[Top][All Lists]

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

Re: Access request to push to translation

From: Jean-Charles Malahieude
Subject: Re: Access request to push to translation
Date: Sun, 21 Jun 2020 14:50:49 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0

Le 21/06/2020 à 13:53, Jonas Hahnfeld a écrit :
Am Sonntag, den 21.06.2020, 13:20 +0200 schrieb Han-Wen Nienhuys:
BTW, regarding translations:

I notice that translation work gets merged as

"commit cb1b3c1fb0c1d9dc1fb6fdadb0907c07b8a692e5
Merge: 22eca98efe b47e5def69
Author: Jean-Charles Malahieude <>
Date:   Sat Jun 20 17:44:05 2020 +0200

     Merge branch 'master' into translation"

could we flip the merge order? The history view in gitk now makes it
look as if 'translation' is the main development branch, while
'master' gets merged in from the side.

+1, that's also what CG will recommend once the updated version is
online. (I did it wrong myself when doing the first merge, and figured
out later that the other order makes more sense.)

For the record, here is how I've proceeded, since one can't directly push "master":

0- pull "translation" and "master", and checkout "translation"
1- merge "master" into translation, with git-gui
2- download sv.po from the FTP
3- just to be sure, run
   ./ && make -j5 && make -j5 doc
4- pull again "master" and merge it into "translation"
5- push "translation"
6- log in at Gitlab
7- open a MR form "translation" into "master"

I think we, translators, need precise, concise and useful directives on how to proceed if the way we've followed since LilyPond uses git must evolute and that might read:

0- pull "master"
1- create and checkout "translation-LL"
2- elaborate the dishes (one commit per manual, at least)
3- push "translation-LL"
4- log in at Gitlab
5- open a MR from "translation-LL" into "mater"
6- delete "translation-LL"

Please let me know, I'm beginning to get lost.


reply via email to

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