Re: [frogs] Corrected patch for Issue #830 |
[ Thread Index | Date Index | More lilynet.net/frogs Archives ]
Marc Hohl schrieb:
Mark Polesky schrieb:I think I found the error, but my computer is doing 'make all' at the moment,Marc Hohl wrote:I have renamed the feta-*.mf files accordingly (see issue #830). I did make clean make all and didn't get any errors. Ok to apply?I don't see any problems looking at the patch, but that doesn't mean there aren't any. I'll let Neil or Carl weigh in here.so I have to wait for some tests.
The error is gone; patch attached.
Hmm - I can switch the option "remove trailing whitespaces" on, but kate doesn't seemOne recommendation: every time you modify a source file, run a macro or something to trim the trailing whitespaces (applying this patch triggered some git warnings). In this case, it's clear that you didn't *add* them (they were in the original files), but even so, patches will apply more cleanly if you make sure to remove them. What text editor are you using?I use kate. I think there are some options about handling whitespaces, I'll have a closer look at the preferences.
to recognize it properly - or I am doing something wrong here.I corrected a few whitespaces manually, but as the are, well, whitespaces, they are
not easily spotted ;-) Yes, some python script would be great ... Marc
Thanks for the hint. Marc- Mark ********** $ git apply 0001-Issue-830-renaming-mf-files.patch [...]-files.patch:144: trailing whitespace. % [...]-files.patch:469: trailing whitespace. labels (5, 6, 7, 8); [...]-files.patch:1080: trailing whitespace. set_char_box (0, 1.6 staff_space#, [...]-files.patch:4256: trailing whitespace. [...]-files.patch:4270: trailing whitespace. warning: squelched 37 whitespace errors warning: 42 lines add whitespace errors.--- ---- Join the Frogs!
Attachment:
Issue-830-renaming-mf-files.patch.gz
Description: GNU Zip compressed data
Mail converted by MHonArc 2.6.19+ | http://listengine.tuxfamily.org/ |