Malte Meyn <[email protected]> writes: > Am 28.12.18 um 21:33 schrieb Phil Holmes: >> A little late to the party, but I am almost certain that running >> makelsr to create an LSR patch and then (after testing with at least >> make, make doc) and pushing that patch, and then putting up the doc >> patch for review is a perfectly accestable way to go. I've rather >> got out of the habit, but I regularly used to run makelsr, eyeball >> it carefully (as in the CG) then push it without review. Extra >> files in the patch won't break the build, only missing ones. > > I think that this sounds like the easiest way. That way every single > commit ‘make’s without problems, there is no makelsr output in the > review of the then following doc patch and one doesn’t have to mess > with different branches. (Ok, I have to admit that I simply didn’t > understand exactly how the solution with separate commits and a merge > should look like. But it seems as if I’m not the only one.) > > Could you, Phil, please push such a makelsr run as you described? As > long as I don’t have permission/trust from some of you to do this > without review, I’d have to go the ‘long’ Rietveld way. > > Of course, if there are objections against this way, I’ll try to > figure out how exactly the ‘separate-branches-and-merge-commit’ thing > works.
Here is an example of the result: $ git log --graph 50b7d56d80c5842ce9bce3bcebe6b0491e37cee3 * commit 50b7d56d80c5842ce9bce3bcebe6b0491e37cee3 |\ Merge: 61275ff8fa 65e12a858d | | Author: David Kastrup <[email protected]> | | Date: Wed Aug 14 09:22:16 2013 +0200 | | | | Merge branch 'issue3487' | | | | Done as a merge commit because of invalid intermediate stages before | | running scripts/auxiliar/update-with-convert-ly.sh | | | * commit 65e12a858de67b4d061c9fb595b81024fe22c6cf | | Author: David Kastrup <[email protected]> | | Date: Fri Aug 9 18:55:12 2013 +0200 | | | | Make regtest for shorthands (Issue 3487) | | | * commit 48a57a1c8feb426029e059d9fbf8aaf1b14f0ff8 | | Author: David Kastrup <[email protected]> | | Date: Tue Aug 6 21:34:01 2013 +0200 | | | | Run scripts/auxiliar/update-with-convert-ly.sh | | | * commit 5c58da93f8859c3f15760631db4e63590e073e1e | | Author: David Kastrup <[email protected]> | | Date: Sun Aug 4 11:32:09 2013 +0200 | | | | Issue 3487: Make several special characters with or without backslash "shorthands" | | | | Single non-alphanumeric ASCII characters not requiring special | | treatment in lexer or parser can now be redefined like escaped | | identifiers. The same holds for escaped non-alphanumeric ASCII | | characters. The identifying name you use for redefining them is the | | string corresponding to the full shorthand, in contrast to escaped | | identifiers where the identifying name omits the initial backslash. | | | | Notable shorthands not treated specially in the parser (some of them | | newly so) can be seen in the following definitions from | | scm/declarations-init.ly: | | | | "|" = #(make-music 'BarCheck) | | "[" = #(make-span-event 'BeamEvent START) | | "]" = #(make-span-event 'BeamEvent STOP) | | "~" = #(make-music 'TieEvent) | | "(" = #(make-span-event 'SlurEvent START) | | ")" = #(make-span-event 'SlurEvent STOP) | | "\\!" = #(make-span-event 'CrescendoEvent STOP) | | "\\(" = #(make-span-event 'PhrasingSlurEvent START) | | "\\)" = #(make-span-event 'PhrasingSlurEvent STOP) | | "\\>" = #(make-span-event 'DecrescendoEvent START) | | "\\<" = #(make-span-event 'CrescendoEvent START) | | "\\[" = #(make-span-event 'LigatureEvent START) | | "\\]" = #(make-span-event 'LigatureEvent STOP) | | "\\~" = #(make-music 'PesOrFlexaEvent) | | "\\\\" = #(make-music 'VoiceSeparator) | | | * commit a7c14a5a83ddf2926895aa40cfdf50e7dcebf53c | | Author: David Kastrup <[email protected]> | | Date: Sun Aug 4 12:21:09 2013 +0200 | | | | Replace staccatissimo shorthand -| with -! | | | | The bar line character is used too prominently, and ! seems more appropriate. | | | * commit 51697e92e7deb4281b6602928f7bbd3e99ee7b36 |/ Author: David Kastrup <[email protected]> | Date: Sun Aug 4 11:36:34 2013 +0200 | | Make tempo range \tempo 20~30 be input as \tempo 20-30 instead | | \tempo's use of ~ was rather untypical for LilyPond. Letting it | rather use @code{-} for ranges leaves just a single use for ties, | making it feasible to make @code{~} definable by the user in a later | commit. | * commit 61275ff8fa4fa01422b4dd6dfc0f6372c7d9cd5e | Author: Phil Holmes <[email protected]> | Date: Sun Aug 11 21:48:26 2013 +0100 | | Release: bump VERSION. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
