Patch-testing-problem

[Thomas Morley]

Hi,

I wanted to test Marc's bar-line-patch somewhat closer, but I have a
problem, not knowing what to do.

I did (because I don't know what went wrong I post every detail):

1. Downloaded the patch from Rietveld and stored it in `0001-bar-line.patch'

2. To get the newest lily-source-code (I'm using LilyDev), not
affected from any other work I might have done, I typed in terminal:
 cd lilypond-git/
 git reset --hard HEAD
 git clean -f

 cd build/
 make clean
 make doc-clean
 make test-clean

 Updating source using "LilyDPond Contributer's Interface" of LilyDev

4. Building lilypond with
 ../configure
 make

5. Establishing test-base-line via
 make test-baseline

6. Back to lilypond-git/ I tried applying the patch with
 git apply --index 0001-bar-line.patch


The terminal returns:

address@hidden ~/lilypond-git (dev/local_working)$ git apply --index
0001-bar-line.patch
error: patch failed:
Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:4
error: Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:
patch does not apply
error: patch failed: Documentation/snippets/alternative-bar-numbering.ly:4
error: Documentation/snippets/alternative-bar-numbering.ly: patch does not apply
error: patch failed: Documentation/snippets/ancient-fonts.ly:4
error: Documentation/snippets/ancient-fonts.ly: patch does not apply
error: patch failed:
Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:4
error: 
Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:
patch does not apply
error: patch failed:
Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly:4
error: 
Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly:
patch does not apply
error: patch failed:
Documentation/snippets/centering-markup-on-note-heads-automatically.ly:4
error: Documentation/snippets/centering-markup-on-note-heads-automatically.ly:
patch does not apply
error: patch failed:
Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly:4
error: 
Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly:
patch does not apply
error: patch failed: Documentation/snippets/chant-or-psalms-notation.ly:4
error: Documentation/snippets/chant-or-psalms-notation.ly: patch does not apply
error: patch failed: Documentation/snippets/chords-headword.ly:4
error: Documentation/snippets/chords-headword.ly: patch does not apply
error: patch failed:
Documentation/snippets/conducting-signs,-measure-grouping-signs.ly:4
error: Documentation/snippets/conducting-signs,-measure-grouping-signs.ly:
patch does not apply
error: patch failed:
Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly:4
error: 
Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly:
patch does not apply
error: patch failed: Documentation/snippets/cross-staff-stems.ly:4
error: Documentation/snippets/cross-staff-stems.ly: patch does not apply
error: patch failed:
Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly:4
error: 
Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly:
patch does not apply
error: patch failed: Documentation/snippets/fretted-headword.ly:4
error: Documentation/snippets/fretted-headword.ly: patch does not apply
error: patch failed: Documentation/snippets/generating-custom-flags.ly:4
error: Documentation/snippets/generating-custom-flags.ly: patch does not apply
error: patch failed: Documentation/snippets/glissandi-can-skip-grobs.ly:4
error: Documentation/snippets/glissandi-can-skip-grobs.ly: patch does not apply
error: patch failed: Documentation/snippets/guitar-slides.ly:4
error: Documentation/snippets/guitar-slides.ly: patch does not apply
error: patch failed: Documentation/snippets/incipit.ly:4
error: Documentation/snippets/incipit.ly: patch does not apply
error: patch failed: Documentation/snippets/jazz-combo-template.ly:4
error: Documentation/snippets/jazz-combo-template.ly: patch does not apply
error: patch failed:
Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly:4
error: 
Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly:
patch does not apply
error: patch failed: Documentation/snippets/numbers-as-easy-note-heads.ly:4
error: Documentation/snippets/numbers-as-easy-note-heads.ly: patch
does not apply
error: patch failed: Documentation/snippets/positioning-multi-measure-rests.ly:4
error: Documentation/snippets/positioning-multi-measure-rests.ly:
patch does not apply
error: patch failed:
Documentation/snippets/redefining-grace-note-global-defaults.ly:4
error: Documentation/snippets/redefining-grace-note-global-defaults.ly:
patch does not apply
error: patch failed: Documentation/snippets/score-for-diatonic-accordion.ly:4
error: Documentation/snippets/score-for-diatonic-accordion.ly: patch
does not apply
error: patch failed: Documentation/snippets/staff-headword.ly:4
error: Documentation/snippets/staff-headword.ly: patch does not apply
error: patch failed: Documentation/snippets/strict-beat-beaming.ly:4
error: Documentation/snippets/strict-beat-beaming.ly: patch does not apply
error: patch failed: Documentation/snippets/string-number-extender-lines.ly:4
error: Documentation/snippets/string-number-extender-lines.ly: patch
does not apply
error: patch failed: Documentation/snippets/using-alternative-flag-styles.ly:4
error: Documentation/snippets/using-alternative-flag-styles.ly: patch
does not apply
error: patch failed:
Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly:4
error: Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly:
patch does not apply
error: patch failed: Documentation/snippets/woodwind-diagrams-key-lists.ly:4
error: Documentation/snippets/woodwind-diagrams-key-lists.ly: patch
does not apply




What's wrong and what should I do instead?


-Harm