bug-lilypond
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Issue 2240 in lilypond: Patch: Don't wrap EventChord around rhythmic


From: lilypond
Subject: Re: Issue 2240 in lilypond: Patch: Don't wrap EventChord around rhythmic events by default.
Date: Sun, 22 Jan 2012 09:17:47 +0000

Updates:
        Labels: -Patch-needs_work Patch-new

Comment #7 on issue 2240 by address@hidden: Patch: Don't wrap EventChord around rhythmic events by default.
http://code.google.com/p/lilypond/issues/detail?id=2240

Ok, here is another theory about your failure: you have old versions of lily/rhythmic-music-iterator.cc and lily/include/rhythmic-music-iterator.hh in your tree, and if you do
git apply patch-from-Rietveld
you get an error message that they are already there, and they don't get updated. Remove them before calling git apply.

Here is how to avoid this in future:
Always when you use git-apply, use git apply --index.  Never anything else.
Why does this help?

It means that the patch is not just applied to the working directory, but also is something git knows about _independently_.

If you afterwards to git reset --hard, git will _not_ touch files in the working it does not know about. In this case, the old versions of the rhythmic music iterator. So they stick around perpetually.

If you did git apply --index instead, git _does_ know about those files. When the patch created them, git reset --hard will remove them again.

So please check again after removing those unregistered files from your work directory manually.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]