Re: Conflicts, conflicts everywhere

[John Mandereau]

Francisco Vila a écrit :
> This is driving me mad. I think that, with the new policy of
> committing our own changes to input/lsr it is impossible to avoid
> conflicts between lilypond/translation and master.
>   

It's not impossible, but it is more difficult... :-/ more below.


> Besides, frequent merges from master into lilypond/translation are
> necessary. Otherwise our check scripts do not take into account the
> latest changes made into master. Agreed?
>   

Of course. The frequence could be something like between once and twice 
a week, I guess.


> So IMHO your eyes have to be used to see merges _not_ caused by
> previous changes+pull, but rather intentional ones, previous to the
> actual updates. I got used to this policy in late 2008 when 2.12 was
> to be released and I wanted to have an up-to-date translation, which I
> usually did on Mondays. But John always merged it before Mondays so
> the translation status was never 100% done. I can live with this
> because it's a matter of waiting a week to be updated again.
>   

Except that I've been more idle on merging lately, not only because I've 
been busy, but because I described the merging policy in the 
Contributors' Guide and at least you are able to apply it.


> But now comes the issue of LSR, whose policy for us is now to commit
> and push our own changes, but either I don't understand it well or
> Neil's updates are always made in the meantime between two merges, so
> these changes are being made always in both branches simultaneously
> which leads to hundredths of conflicts.
>   
Merging master into lilypond/translation just before you run makelsr.py 
to update translated texidocs, and conversely merging 
lilypond/translation into master as soon as you ran makelsr.py and "make 
web". If conflicts still happen, just don't solve them manually. In 
general, it makes no sense to spend dozens of hours to fix conflicts in 
generated files: you can solve conflicts in PO files with a combination 
of msgmerge and "git checkout", and solve conflicts in input/lsr with a 
combination of "git checkout" (to restore files as they were in master) 
and (i.e. then) calling makelsr.py to update translated texidocs again.

I can look at merging lilypond/translation and master if you like, but 
not before the middle of next week.

Best,
John