James <[email protected]> writes: > Hello, > > I've cleared out my .lilypond-patchy-cache too. But I cannot force > patchy to merge staging. > > I've not had this error before, I understand what it means but not how > it happened.
Francisco pushed commits directly to master instead of staging. I've taken a look through the commits, but at least commit b8f58d9897229562d1fb2dc558f8f4309005008d Author: Francisco Vila <[email protected]> Date: Fri Feb 7 12:01:47 2014 +0100 Doc: misplaced comments produce wrong HTML output. is totally wrong (I don't think was ever entered into review and cannot find the commit id in the issue tracker) since the problems will get reintroduced when makelsr is getting run: the problems need to get fixed in Documentation/snippets/new instead and propagated with makelsr. Since we made it a policy to _never_ rewind master, I will revert that commit, push the result from reverting that commit to staging (which puts staging back ahead of master), and then we'll see whether it goes through. If not, more reverts will be required. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
