Re: [PATCH] Improve compatibility between M4 and CPP.

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[please keep the discussion on the list]

According to Raphael 'Kena' Poss on 7/8/2009 7:43 AM:
> 
> Op 8 jul 2009, om 14:41 heeft Eric Blake het volgende geschreven:
>> so suggestions for a better name that avoids option-name ambiguity
>> would be welcome (maybe '--alternate-synclines'?).
> 
> I'm fine with that. Seems reasonable.
> 
>> Related, yes.  But same patch, no, because the proposed changes to
>> __line__ are useful without injecting m4 between cpp and cc1.  And git
>> makes it particularly easy to split patches into smaller, logical chunks.
> 
> I'm sure you can tell me how to do that :)

I find it pretty easy to do:

$ git reset HEAD^ # keep the changes of the current commit, but the state
of the previous commit
$ git add -p # pick and choose which hunks to add
$ git stash save --keep-index # save the remaining hunks for later
$ test that everything works in the intermediate state
$ git commit # commit that state
$ git stash pop # restore the remaining hunks
$ test that everything works in the final state
$ git commit -a # commit the final state

The git documentation has more tips on reworking patch series into a final
form.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpUpkMACgkQ84KuGfSFAYABvQCcDJmrKc0WFz81t+KcAOlnOgm6
wDwAn23f4oRADMX8XOI6GjDrGXlLbOx4
=0CqN
-----END PGP SIGNATURE-----