[Ksummit-discuss] [CORE TOPIC] kernel unit testing
Geert Uytterhoeven
geert at linux-m68k.org
Fri Jul 15 11:05:31 UTC 2016
On Fri, Jul 15, 2016 at 8:32 AM, James Bottomley
<James.Bottomley at hansenpartnership.com> wrote:
> On Fri, 2016-07-15 at 15:52 +1000, NeilBrown wrote:
>> I do find quilt useful when backporting a series of patches so that I
>> can resolve the conflicts on each patch individually and move
>> backwards and forwards through the list of patches. I don't think
>> git has an easy way to store a branch of patches-that-I-need-to-apply
>> and to then give me one at a time, removing them from the branch. I
>> could use 'stgit' for that if necessary, though it is very tempting
>> to write something that is better integrated with git.
>
> Git cherry and git cherry-pick can do this. Git cherry-pick can take a
> range of patches to apply, so you can select a bunch of patches to
> backport or otherwise move all at once. Git cherry can tell you (to
> within an approximation, since it uses matching) what patches are
> common between two branches even if they have differing commit ids.
... which is basically the same as creating a new branch matching your old
private tree, and rebasing that --onto the new upstream.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
More information about the Ksummit-discuss
mailing list