Re: Patch-testing-problem

[Keith OHara]

Thomas Morley <thomasmorley65 <at> googlemail.com> writes:

> I wanted to test Marc's bar-line-patch somewhat closer, but I have a
> problem, not knowing what to do.
> 
>  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

"patch does not apply" means that the code you have as a starting point is
significantly different from the starting point of the patch.

Phil ran an LSR update recently, which changes Documentation/snippets/*
Marc's patch also changes many of those same files.  Phil's  LSR update was
in commit 5c42908f1c8d0a5c1d88851a2d793ca55476612c so you can go back to the
state just before,
       git checkout 5c42908f^
and then apply Marc's patch.

Marc will probably rebase his patch pretty soon and repost it so that the
diff applies to the codebase after the LSR update.