From: Hamish <dmishd@gmail.com>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] Need help applying patches
Date: Sun, 20 Feb 2011 19:55:33 +0000 [thread overview]
Message-ID: <1298230750-sup-6418@whisper> (raw)
In-Reply-To: <1298228733-sup-6115@whisper>
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
next prev parent reply other threads:[~2011-02-20 20:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-20 19:19 Hamish
2011-02-20 19:55 ` Hamish [this message]
2011-02-22 13:14 ` Gaudenz Steinlin
2011-02-20 20:12 ` Michael Hamann
2011-02-20 21:58 ` William Morgan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298230750-sup-6418@whisper \
--to=dmishd@gmail.com \
--cc=sup-devel@rubyforge.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox