Getstart Merge Request #162: Fr translation of takeoff.tex (open)

Hello,
could you please merge this branch to Next ?
Only file source/takeoff.tex has been updated.
Compilation is OK on my computer.

Thanks.
Best regards.

[Florent Rougon]

Hello,

Sorry, but as you can see, the merge request has conflicts. Some, or all of the changes from d52d6958 are already in next. Please

• backup your getstart repository;
• follow the instructions from the wiki, simply replacing FGData with getstart.

First do it with something small, one commit; we can merge other commits later.

At step 10 of the wiki instructions (“make your changes”), you'll probably just copy a file (e.g. takeoff.tex) from your backup to the clean, up-to-date getstart repository, when your “feature branch” is checked out (a branch dedicated to the particular change you want to merge). Then check with git diff that this makes sense before committing (in particular, that your change doesn't undo things that are desirable).

Hope this helps. Regards

P. S. : je peux écrire en français si quelque chose dans mon message n'est pas clair.

[Florent Rougon]

Note (je paraphrase et complète un peu le wiki) : après avoir fait des changements, par exemple dans takeoff.tex, git diff montre ces changements. Si ensuite vous faites git add takeoff.tex (dans le bon dossier), ces mêmes changements ne seront plus visibles avec git diff mais ils le seront avec git diff --cached, car ils seront alors dans l'index de Git.

Il est possible et très pratique de procéder avec plus de granularité pour le git add. Si jamais, après avoir copié un fichier depuis votre sauvegarde vers le dépôt propre et à jour, git diff montre que seuls certains changements sont désirables, vous pouvez évidemment régler le problème à la main, mais il y a souvent plus pratique : avec git add -p, vous pouvez choisir d'ajouter à l'index seulement une partie des changements (c'est une commande interactive). Une fois ceci terminé, vous vérifiez avec git diff --cached et faites le commit sans l'option -a. Vous pouvez vérifier le dernier commit avec git log -p -1.

Si le commit contient bien tous les changements désirables, alors git diff ne doit plus montrer que les changements que vous avez jugés indésirables (ceux que vous avez laissés de côté lors du git add -p). Vous pouvez alors vous en débarrasser avec git reset --hard (ils sont encore dans votre backup au cas où !). Après cela, un git status doit montrer que c'est tout propre, prêt pour le “merge” (après avoir vérifié que ça compile bien avec makegetstart.sh ;-).

[Florent Rougon]

Forgot to say: in case you added too many changes to the Git index with git add -p, you can retract any of them with git reset -p. That command is interactive in the same way as git add -p.

Note: the “Git index” is a staging area for changes that you intend to include in the next commit.

[André Dazereix]

Hello Florent,
thanks a lot for your tips, this really helped me.
OK, now, compilations in HTML and PDF formats are clean, with return code 0, and docs produced seems to be correct.
Can you tell me if it's indeed the case ?
I hope :-) and waiting for your potential remarks.
Best regards

[Florent Rougon]

Hi André,

Unfortunately, as you can see at the top of this page, this merge request has conflicts and wants to merge 4 commits, 3 of which are old commits not from you. This indicates that your feature branch (the one called joystick in the wiki instructions) was not based on the current state of origin/next. Seeing steps 8 and 9 of the wiki instructions, I don't see how this is possible unless you used some other tool (graphical Git interface...) not mentioned in these instructions.

In particular, origin/next must be a recent commit of the official getstart repository, and after step 8 (git checkout -b joystick origin/next), the HEAD of the newly-created branch joystick must point exactly to the same commit. If you then perform 1 commit on top of this, then branch joystick will have 1 commit more than very recent next. This can't bring old commits from 2019, from the master branch...

I can merge your commit after proofreading a bit more but will not merge other commits unless your merge request is clean, as doing so would quickly become too uncomfortable and time-consuming. Note that a new attempt can be done in a new merge request, no problem with that.

If you intend to submit other changes:

• please try to make the MR clean by strictly following the instructions;

• after completing step 8, show the outputs of git status and git log -2;

• don't proceed with other steps before I've seen these outputs.

Don't forget to make a backup of the files you changed and keep it out of the repository. The wiki instructions use the branch name joystick for the changes to be submitted (what I call the “feature branch”). Feel free to choose another name, such as french-update-of-takeoff.tex.

Regarding the % needs fr translator review comments: once you have reviewed and updated the corresponding texts, please only leave the % unless you really think the updated contents will quickly become obsolete as time goes (that should be the exception rather than the rule). Normally, when the English text is later updated, the % needs fr translator review comment would be added again, so that git grep -F "% needs fr translator review" would display things the French translator should care about.

Thanks & regards

[Florent Rougon]

Maybe you simply needed to base your changes on next (master is an old branch here). I can help with command-line Git and the documented instructions, but can't see your Git tool if you use something else...