Re: [sup-devel] Need help applying patches

[Hamish <dmishd@gmail.com>]

Excerpts from Hamish's message of Sun Feb 20 19:19:17 +0000 2011:
> Gaudenz has submitted a few useful patches which I want to commit to the
> gpgme branch, but git apply seems to fail. I've forwarded the message
> text below, and attached the patches. When I apply it gpgme, I get:

Of course, having just written an email describing my problem, I do a
little more playing about and manage to find a way through. To record
what I did:

$ cat ../patches2merge/0001-Unify-formatting-of-GPGME-error-messages.patch | git am -s -3
$ vim lib/sup/crypto.rb
$ git add lib/sup/crypto.rb
$ git am -3 --resolved

Rinse and repeat for the other 2 patches. And now the log looks like I
expect it to. 

I ran into some more issues merging this into next - my usual
cherry-pick method led to the same problems as originally, and led to me
being listed as the committer, but I managed to do a git merge which 
preserved the commit messages from Gaudenz (although a couple of mine
appear to be repeated).

If there is some better way to do this in future, please tell me.

Hamish
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel