Re: How to include a file/definition temporarily?

[Patrick Schmidt]

> > BTW at the end of the build process I got the following errors:
> > 
> > Dissecting...lilypond-book.py: error: file not found: fretboards-
> > alternate-tables.ly
> 
> Do you have a file 
> Documentation/snippets/new/fretboards-alternate-tables.ly?
> 
No, I haven't.
> IF you do, you may need to run
> 
> scripts/auxiliar/makelsr.py
> 
> in order to get the file from Documentation/snippets/new to
> Documentation/snippets.
> 
> But I'm not 100% sure about that.
> 
> > 
> > I also tried to apply issue2208048_11001.diff but to no avail (loads
> > of errors/process aborted). Is there anything else I have to pay
> > attention to? Do I have to remove old patches before I can apply new
> > ones?
> 
> Probably.  The patch is relative to master, not relative to the previous
> patch set, if I understand correctly.
I removed issue2208048_1012.diff and typed:

    git apply issue2208048_11001.diff

I received the following messages:

error: patch failed: Documentation/notation/fretted-strings.itely:7
error: Documentation/notation/fretted-strings.itely: patch does not apply
error: patch failed: 
Documentation/snippets/customizing-fretboard-fret-diagrams.ly:1
error: Documentation/snippets/customizing-fretboard-fret-diagrams.ly: patch 
does not apply
error: patch failed: 
Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:1
error: 
Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly: 
patch does not apply
error: Documentation/snippets/new/fretboards-alternate-tables.ly: already 
exists in working directory
error: patch failed: input/regression/predefined-fretboards.ly:1
error: input/regression/predefined-fretboards.ly: patch does not apply
error: patch failed: ly/declarations-init.ly:32
error: ly/declarations-init.ly: patch does not apply
error: patch failed: ly/engraver-init.ly:40
error: ly/engraver-init.ly: patch does not apply
error: patch failed: ly/predefined-fretboards-init.ly:42
error: ly/predefined-fretboards-init.ly: patch does not apply
error: patch failed: ly/predefined-guitar-fretboards.ly:20
error: ly/predefined-guitar-fretboards.ly: patch does not apply
error: patch failed: ly/predefined-guitar-ninth-fretboards.ly:15
error: ly/predefined-guitar-ninth-fretboards.ly: patch does not apply
error: patch failed: ly/predefined-ukulele-fretboards.ly:15
error: ly/predefined-ukulele-fretboards.ly: patch does not apply
error: patch failed: ly/property-init.ly:337
error: ly/property-init.ly: patch does not apply
error: patch failed: python/convertrules.py:3056
error: python/convertrules.py: patch does not apply

Do I have to pull before I apply a new patch?

Thanks for your help!

patrick
-- 
Neu: GMX De-Mail - Einfach wie E-Mail, sicher wie ein Brief!  
Jetzt De-Mail-Adresse reservieren: http://portal.gmx.net/de/go/demail