Re: Bad translation merge

[Jean-Charles Malahieude]

Le 07/03/2012 15:29, David Kastrup disait :
> 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.

I don't know if this can help, but I see many "doubled commits" in 
gitk, like

Doc: fix link in all languages.

which look like committed twice:
f715a8eb30eb26b770b3888c1dcbbea00699e4eb
Parent: 9ce85aa991ea6adb9f939d274ac439bf89daff67 (Doc: update snippets 
and run makelsr.)
Enfant:  7b3a63a4a301a67a6812a73542d25016bfb32ebb (Doc: cosmethic change 
in snippet, translate and makelsr result.)
Branche: lilypond/translation, remotes/origin/lilypond/translation, 
remotes/origin/master, remotes/origin/staging
Suit: release/2.15.29-1
Précède: release/2.15.32-1

and
0058d34243ff16f1479acbed24b956e292e9dd3d
Auteur: Francisco Vila <address@hidden>  2012-02-23 19:24:00
Auteur du commit: Francisco Vila <address@hidden> 
2012-02-24 19:02:05
Parent: e7d1bb755923cbacf04075b7d319c574da28940d (Doc: update snippets 
and run makelsr.)
Enfant:  04ed9273119ff228a003f7695b19ca34a4ba74dc (Doc: cosmethic change 
in snippet, translate and makelsr result.)
Branche: lilypond/translation, remotes/origin/lilypond/translation, 
remotes/origin/master, remotes/origin/staging
Suit: release/2.15.30-1
Précède: release/2.15.31-1


or Doc-fr: NR-2.5 percussion: Full review with
0c9027d3b2c5a61e44726f5ba4b831b3e10bed8f and
3517ba40f1a928edf0e06e88b77fc5ea2b62418d


How may I help?
Jean-Charles