From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeff Garzik <jeff@garzik.org>
Subject: Re: [Patch 1/1] CLD: Introduce the "New CLD" API
Date: Thu, 18 Feb 2010 21:41:35 -0500
Message-ID: <4B7DFA5F.5050705@garzik.org>
References: <20100207121550.7ee94ff6@redhat.com>	<4B774942.9040308@garzik.org>	<20100217170521.3a328044@redhat.com>	<4B7C957C.8090109@garzik.org> <20100218183514.4898ff62@redhat.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <hail-devel-owner@vger.kernel.org>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:sender:message-id:date:from
         :user-agent:mime-version:to:cc:subject:references:in-reply-to
         :content-type:content-transfer-encoding;
        bh=W3yHUyimz5OMIxAsbl5mUmQ4AHyHBkXbhSkTRg9EJAM=;
        b=EgMu8tySH32bKCcFbUQEoBzTLLUqCpg9sliWOuZlcYytBH5OoA8x2muDGKaL4k1j3q
         sOkOrakxEtCnxdVbk6Xw7Ovyg8t1r9f/1WUTgVupKtR6gCHw99bgksmFoHxHHyASKill
         dH+XXJlYCvhh9Yewra87nlDJnq5m7ABECrKaU=
In-Reply-To: <20100218183514.4898ff62@redhat.com>
Sender: hail-devel-owner@vger.kernel.org
List-ID: <hail-devel.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"; format="flowed"
To: Pete Zaitcev <zaitcev@redhat.com>
Cc: Project Hail List <hail-devel@vger.kernel.org>

On 02/18/2010 08:35 PM, Pete Zaitcev wrote:
> On Wed, 17 Feb 2010 20:18:52 -0500
> Jeff Garzik<jeff@garzik.org>  wrote:
>
>>>> A point of style:  the 'p' suffix is discouraged.
>>>
>>> I'll batch-rename it when I get better.
>
>> Since it sounds like there will be no conflicting patches, I went ahead
>> and fixed things up myself, using my trusty sar (search-and-replace)
>> script.  I find sar quite useful, because it (a) matches and replaces on
>> word boundaries, and (b) it performs in-situ updates, unlike most other
>> Unix tools.
>
> I imagine the numbers of '>>>>>>' clauses I have to fix after the
> next "git pull". Oh well.

If you perform the substitutions on your local working tree using the 
sar script, the diff between git HEAD and your local working tree should 
provide something manageable.

That's how to I split up Colin's XDR patch into multiple patches... 
repeatedly diff between HEAD and XDR-everything trees, apply a subset of 
the total diff, a single logical change. lather rinse repeat.

	Jeff