On 2015/12/23 07:59:26, git wrote:
Revert changes to snippets file
At the current point of time, you only added Documentation/snippets/new/xxx.ly while keeping Documentation/snippets/xxx.ly unchanged. That's the right organisation for a commit keeping manual and automatic changes apart. The actual change is then performed in a separate commit named "Run scripts/auxiliar/makelsr.py". Now if the old snippet stops compiling altogether, the usual remedy will be to write a convert-ly rule fixing that, and create a separate "Run scripts/auxiliar/update-with-convert-ly.sh" commit. At any rate, it is good to avoid uncompilable commits in master, so the best remedy is to do this sort of thing, when the intermediate state won't compile, in a separate branch which is then merged in a single commit into master. The next best thing is to just fold the automated changes into the same commit. That probably requires less haggling with Git but is slightly less nice to the commit history. But this complication is just for intermediate states that won't compile: if the intermediate states compile fine by themselves, one can submit them as separate commits just fine. https://codereview.appspot.com/276560043/ _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
