Re: Does the following Python error in the musicxml tests ring a bell?

[David Kastrup]

Jonas Hahnfeld <address@hidden> writes:

> Am Dienstag, den 03.03.2020, 17:10 +0100 schrieb David Kastrup:
>> David Kastrup

> Sounds good to recycle the work.
>
>> > 
>> > The history is yours, the tree is mine.
>> 
>> Wait, wrong branch/HEAD.
>> 
>> Check out your version (should be merged to the same point of master I
>> did)
>
> Instead I just merged current master into your branch.
>
>> then do
>> 
>> git checkout davids-version .
>> 
>> The period is important!  It means "don't really checkout that commit,
>> only ./ from it and all subdirectories".  Which amounts to everything
>> but the history.
>
> Perfect. I only restored the following files from the branch to keep
> the Portuguese translation:
>  * Documentation/web/server/lilypond.org.htaccess
>  * ROADMAP
>  * python/langdefs.py

Ouch.  Yes, I had assumed that everything important would be in
Documentation/??/ and I at least discovered on my own that I had
overlooked Documentation/pictures/ .  But not the rest.  I also had
conflicts in config.hh.in aclocal.in and some Makefile.  Could also be
related to Portuguese or something.

>> Then
>> 
>> git commit --amend -C HEAD
>> 
>> and you should be done.
>
> Result at dev/translation-picking-merge, currently running a doc build
> just to be sure.


-- 
David Kastrup