On Sun, Jun 22, 2008 at 2:51 PM, Carl D. Sorensen <[EMAIL PROTECTED]> wrote:

>> Sure, but it is good practice to not mix the formatting
>> cleanups and functional cleanups in the same code.
>
> OK.  So right now I have some functionally changed code  with ugly formatting
> that passes the regression test.  Would you prefer to:
>
> 1) Pull a patch  on the ugly code, then have me fix the formatting an pull 
> another patch
>
> 2) Have me fix the formatting on the original code (as is currently in 
> LilyPond),
>  pull a patch, and then have me redo the revised functionality (I don't think 
> I
>  can do this well with git diifs; I think I'll have to manually re-enter the
>  code changes)
>
> 3) Have me fix the formatting on the working code and verify that it works 
> with the
>  regression test, and then you can pull the working, formatted code (but this 
> will
>  not be good practice, as it mixes formatting cleanups and functional changes)
>
> 4) Do something else that I haven't thought of

I am fine with mixing formatting and real code if it's limited to a
specific area (the fret code).  If you are modifying all of the SCM
code (eg reindenting define-grobs.scm) it would be nice if that
happened in a separate commit

-- 
Han-Wen Nienhuys - [EMAIL PROTECTED] - http://www.xs4all.nl/~hanwen


_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to