From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.224.197 with SMTP id ip5cs143120icb; Sun, 20 Feb 2011 12:12:32 -0800 (PST) Received: by 10.52.161.226 with SMTP id xv2mr749575vdb.260.1298232752389; Sun, 20 Feb 2011 12:12:32 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id q18si6594234vcr.27.2011.02.20.12.12.32; Sun, 20 Feb 2011 12:12:32 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org; dkim=neutral (body hash did not verify) header.i=@gmail.com Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id F08451858376; Sun, 20 Feb 2011 15:12:31 -0500 (EST) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by rubyforge.org (Postfix) with ESMTP id 5C004185835A for ; Sun, 20 Feb 2011 14:55:37 -0500 (EST) Received: by wyb42 with SMTP id 42so5415321wyb.23 for ; Sun, 20 Feb 2011 11:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:content-type:subject:from:to:in-reply-to :references:date:message-id:user-agent:content-transfer-encoding; bh=J50/xBOZYpcnAJsopvpH9eSJGZfMdSN6ZyhwmsZi/sE=; b=ly4ethEw8PFw4K2YaO7/oNXrG9DIx/oKzlNzR5zDRM7sJqgXWstvFO3MDai1lnrL3l AWOEdJ+mu16QjtmlgBdGeTlvawiN5p5SJlbgj4hlySqaQA5knDczwfFX13RYvMJrtbRx 1qAKCCvjw+SD5mmFCi2ZDPABSXGTO7bV6RsBI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=content-type:subject:from:to:in-reply-to:references:date:message-id :user-agent:content-transfer-encoding; b=YDr9ct6pcqgfHzgcxoXyr6Rm636eveJeZryZ6F8DI8gC6J/LM4X6SWmANE2dI7zAUH K2Kt9ZT648b4EDp89xVngEaKDqu0G8pEoT6B909fkEY1s/DSVOTMZQGjLmS/m5NcIL/t o1PUs3j8GmD5xHgyNyB98YhidvUPP7gfc08Nk= Received: by 10.216.82.20 with SMTP id n20mr460671wee.107.1298231736669; Sun, 20 Feb 2011 11:55:36 -0800 (PST) Received: from localhost (cpc12-cmbg15-2-0-cust81.5-4.cable.virginmedia.com [86.30.247.82]) by mx.google.com with ESMTPS id j49sm1762400wer.38.2011.02.20.11.55.34 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Feb 2011 11:55:35 -0800 (PST) From: Hamish To: sup-devel In-reply-to: <1298228733-sup-6115@whisper> References: <1298228733-sup-6115@whisper> Date: Sun, 20 Feb 2011 19:55:33 +0000 Message-Id: <1298230750-sup-6418@whisper> User-Agent: Sup/git Subject: Re: [sup-devel] Need help applying patches X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org 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