From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.224.197 with SMTP id ip5cs63818icb; Thu, 17 Feb 2011 15:31:00 -0800 (PST) Received: by 10.224.2.206 with SMTP id 14mr30760qak.78.1297985460169; Thu, 17 Feb 2011 15:31:00 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id x9si2937659qco.133.2011.02.17.15.30.59; Thu, 17 Feb 2011 15:31:00 -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 ABFD61678326; Thu, 17 Feb 2011 18:30:59 -0500 (EST) Received: from mail-qy0-f178.google.com (mail-qy0-f178.google.com [209.85.216.178]) by rubyforge.org (Postfix) with ESMTP id DD96E18582E2 for ; Thu, 17 Feb 2011 17:57:43 -0500 (EST) Received: by qyk33 with SMTP id 33so3042061qyk.2 for ; Thu, 17 Feb 2011 14:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type; bh=1Oq/bzufn3WacHJo3Onu2MdrvyV01hMMHrJ3UldqgrY=; b=x5fd1bYqU10Y4LDMqd4EanE4J7M4HbScXt3fpU146aPPOBLv/RcQN4egXMLjDaH0y7 fIp1j2NGMGhXAqrU4c2wFGOoT3DzLN1RUcxOZOg9bl2SSp6ugwpXgZ8bB7bV3qmZau3v 16RJlaFBIQEiWNG0pVJUSoBNs0v0v/vjGfMIc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=p/xAkZqcqq5CXl1vw8R+iARLDs/ueILXkUQ1VFn9jMXu+mhb5uC5aCsrDqWVPatAcM yRR9RfuGUoa015qaILAXFPiGw4NafYwHm0OoSeMZeN7lyQJHSTIRjKNTveIkZrzc8sQz kWFxTO+8Cka0lcGzt/LoyuxCOQaaAzVmT/0aE= MIME-Version: 1.0 Received: by 10.229.224.73 with SMTP id in9mr2895054qcb.254.1297983462709; Thu, 17 Feb 2011 14:57:42 -0800 (PST) Received: by 10.229.218.79 with HTTP; Thu, 17 Feb 2011 14:57:42 -0800 (PST) In-Reply-To: <1297974845-sup-4146@meteor.durcheinandertal.local> References: <1297953902-sup-8049@meteor.durcheinandertal.local> <1297974845-sup-4146@meteor.durcheinandertal.local> Date: Thu, 17 Feb 2011 22:57:42 +0000 Message-ID: From: Hamish D To: Sup developer discussion Subject: Re: [sup-devel] GPGME fixes 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org >> I like the others though, though in applying them I ran into some >> trouble, partly through my adding lines near the top of the file that >> change line numbers and seemed to confuse git. So they are now applied >> to a local copy, but in my name (but with your commit messages). > > What command do you use to apply the patches? If I can fetch your > changes somewhere I can also rebase my patches on top of them. My changes are on the gpgme branch on gitorious. I used the git apply command. I also tried git am but that did't work at all. Hamish _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel