James <[email protected]> writes: > Hello, > > While trying to merge Staging just now, it fails on make
> 405: 2* (let* ((file-name (%search-load-path x))) (ly:debug "[~A" > file-name) ...) > 409: 3* [primitive-load-path > "/tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/define-grobs.scm"] > In > /tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/define-grobs.scm: > 28: 4* (define-public all-grob-descriptions (quasiquote (# # # # ...))) > 28: 5 (begin (define-private all-grob-descriptions #) (eval-case #)) > In unknown file: > ?: 6* (define-private all-grob-descriptions (quasiquote (# # # # ...))) > In > /tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/define-grobs.scm: > 29: 7* (quasiquote (# # # # ...)) > > /tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/define-grobs.scm:29:3: > In expression (quasiquote (# # # ...)): > /tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/define-grobs.scm:29:3: > Unbound variable: inherit-x-parent-visibility Looks like Janek did not bother to check "make" after rebasing and likely fixing a merge conflict (which was done right but was accompanied by the same problem in a different place where it was not automatically detectable). I'll clean up the kaboodle. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
