From: Jeff Garzik <jeff@garzik.org>
To: Pete Zaitcev <zaitcev@redhat.com>
Cc: Project Hail List <hail-devel@vger.kernel.org>
Subject: Re: [Patch 1/1] CLD: Introduce the "New CLD" API
Date: Thu, 18 Feb 2010 21:41:35 -0500 [thread overview]
Message-ID: <4B7DFA5F.5050705@garzik.org> (raw)
In-Reply-To: <20100218183514.4898ff62@redhat.com>
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
next prev parent reply other threads:[~2010-02-19 2:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-07 19:15 [Patch 1/1] CLD: Introduce the "New CLD" API Pete Zaitcev
2010-02-07 22:26 ` Jeff Garzik
2010-02-08 12:32 ` Jeff Garzik
2010-02-09 0:30 ` Pete Zaitcev
2010-02-09 6:25 ` Jeff Garzik
2010-02-09 1:46 ` Pete Zaitcev
2010-02-09 2:06 ` Jeff Garzik
2010-02-09 2:17 ` Pete Zaitcev
2010-02-09 4:55 ` Jeff Garzik
2010-02-09 5:35 ` Pete Zaitcev
2010-02-09 6:03 ` Jeff Garzik
2010-02-14 0:52 ` Jeff Garzik
2010-02-18 0:05 ` Pete Zaitcev
2010-02-18 1:18 ` Jeff Garzik
2010-02-19 1:35 ` Pete Zaitcev
2010-02-19 2:41 ` Jeff Garzik [this message]
2010-02-19 22:23 ` Pete Zaitcev
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=4B7DFA5F.5050705@garzik.org \
--to=jeff@garzik.org \
--cc=hail-devel@vger.kernel.org \
--cc=zaitcev@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.