[Sugar-devel] Inline patches and Gmail - was: [PATCH clock] Port to Cairo
manuq at laptop.org
Fri Feb 24 06:53:32 EST 2012
El día 23 de febrero de 2012 16:17, Gary Martin
<garycmartin at googlemail.com> escribió:
>> "git am patch-name" should do the trick with the latest Clock from git.
> Thanks yes the patch you attached applied just fine – and previously I did copy/paste from gmail so this email patch workflow is pretty broken for me :( I'll need to look and see if I can dance around whatever google is doing to the patch text.
Yes, gmail is very bad for email patches, what works for me is:
1. "Show original"
2. save the page into a file (it's text/plain)
3. remove the first empty lines
Then "git am" works. There are a number of steps, now I'm used to do
it, but yes, it's boring.
> I wonder if we could revert to using the Gitorious workflow for Activities, the flood of email patches and re-submissions has never really worked for me (luckily I can just ignore the vast majority of that email). FWIW the Gitorious workflow is pretty much:
> - log in and visit a rep
> - click the Add repository button
> - make a local git clone of your new clock rep
> - hack on your local clone, commit, push as desired
> - once happy, click the Gitorious Merge request button
> It's so much easier for me to review syntax coloured, formatted patches, and see the various commit steps one by one if your changes are quite numerous, and then Gitorious gives me the single git command line needed to merge in your changes with all the correct 'who did what and when' details.
I know the current workflow was discussed and decided before I entered
the project. Maybe the people that participated can point us to the
discussion thread. Personally I'm open to Gitorious Merge request,
but I think it involves more work to the patch sender.
I will answer the Clock patches review now...
.. manuq ..
More information about the Sugar-devel