On Sun, Jan 22, 2017 at 8:20 AM, David Kastrup <d...@gnu.org> wrote: > David Nalesnik <david.nales...@gmail.com> writes: > >> On Sun, Jan 22, 2017 at 7:45 AM, James <p...@gnu.org> wrote: >>> Hello, >>> >>> David Nalesnik checked in a commit with a new snippet but forgot to push a >>> separate makelsr checkin to go with it so merge fails. >>> >>> Could someone do that as I currently at work today (lucky me) and won't have >>> time to do it myself for at least another 3 or 4 hours. >>> >> >> I didn't forget. I didn't think it was necessary: >> >> The snippet I recently corrected >> (https://sourceforge.net/p/testlilyissues/issues/5030/) was never in >> Documentation/snippets/ just Documentation/snippets/new. So makelsr >> hadn't been run. > > That does not even make sense. The whole purpose of the makelsr > procedure is to copy Documentation/snippets/new over the material from > Documentation/snippets where the documentation will get built.
What I don't understand is how the merge of the original commit should have succeeded when there was no checkin of the results of a makelsr on the using-marklines-... snippet. > >> - Running makelsr on that (original) snippet should have caused merge >> to fail as well. >> >> I simply don't understand. > > I'll take a look at what's left to do. > I appreciate this. Thanks, DN _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
