From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.224.197 with SMTP id ip5cs145652icb; Sun, 20 Feb 2011 13:58:27 -0800 (PST) Received: by 10.52.160.66 with SMTP id xi2mr865719vdb.38.1298239107271; Sun, 20 Feb 2011 13:58:27 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id v20si6680450vbm.59.2011.02.20.13.58.26; Sun, 20 Feb 2011 13:58:26 -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 Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id ECE491858357; Sun, 20 Feb 2011 16:58:25 -0500 (EST) Received: from masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id 59B8B1858361 for ; Sun, 20 Feb 2011 16:56:47 -0500 (EST) Received: from w by masanjin.net with local (Exim 4.71) (envelope-from ) id 1PrHIF-0003bp-Dl for sup-devel@rubyforge.org; Sun, 20 Feb 2011 21:58:15 +0000 From: William Morgan To: sup-devel In-reply-to: <1298228733-sup-6115@whisper> References: <1298228733-sup-6115@whisper> Date: Sun, 20 Feb 2011 21:58:13 +0000 Message-Id: <1298238906-sup-3941@masanjin.net> 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 Reformatted excerpts from Hamish's message of 2011-02-20: > But I can't see why it could not find it. The code quoted above has > moved down by 31 lines, but is otherwise unchanged, but I thought git > could cope with that :/ Git apply is a pretty low-level command and I believe it acts basically like the patch command, i.e. fails fast if things aren't perfectly in tune. To pull in the git merge logic on patch files, use `git am -3`. > $ git am -s ../patches2merge/ > Nothing to do. I think it's trying to interpret that directory as a maildir. Give it the individual files. -- William _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel