On Fri, Jan 15, 2010 at 09:23:17AM -0600, Chris Bagwell wrote: > On Thu, Jan 14, 2010 at 10:32 PM, Peter Hutterer > <peter.hutte...@who-t.net>wrote: > > which commit is this supposed to go on? It doesn't seem to apply to any of > > the last 15 commits in my tree. > > Really? Its a fresh clone of sourceforge git from two days ago. My git log > shows last commit before mine as: > > [my commit is most recent] > commit 10e8f8fc543822091b36168965783aa45b9b7d31 > Author: ch...@cnpbagwell.com <ch...@cnpbagwell.com> > Date: Thu Jan 14 13:32:52 2010 -0600 > > [your commit is second to recent] > commit edf28df08b557ea6b7edb6c721670745c9e59cb6 > Author: Peter Hutterer <peter.hutte...@who-t.net> > Date: Thu Dec 24 21:18:10 2009 +1000 > > > I'm far from a git expert and could have done something wrong. Let me > research and see how to proceed.
I got a few emails regarding this from both you and Ping, so I'll just reply in this one :) this way others know too what went wrong. The patch you sent me via attachment worked. Some email clients mangle whitespaces and destroy the context of the patch (or the patch itself). This is what seems to have happened with your original patch. I just looked Tt it again and all the tabs were replaced with spaces and thus git am got confused searching for the context. (fwiw, I apply patches with "git am" or if needed "git am -3") IIRC gmail and thunderbird are both known to do that, and copy-paste is always bad as it does the same. thanks for re-sending, applied and pushed, sorry it didn't make 0.10.4 but 0.10.5 isn't far off. Cheers, Peter ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
