Re: Kernel SCM saga..

Arjan van de Ven
2005-04-07T20:54:56Z

On Thu, 2005-04-07 at 20:04 +0200, Jörn Engel wrote:
> On Thu, 7 April 2005 10:47:18 -0700, Linus Torvalds wrote:
> > On Thu, 7 Apr 2005, Al Viro wrote:
> > >
> > > No. There's another reason - when you are cherry-picking and reordering
> > > *your* *own* *patches*.
> >
> > Yes. I agree. There should be some support for cherry-picking in between a
> > temporary throw-away tree and a "cleaned-up-tree". However, it should be
> > something you really do need to think about, and in most cases it really
> > does boil down to "export as patch, re-import from patch". Especially
> > since you potentially want to edit things in between anyway when you
> > cherry-pick.
>
> For reordering, using patcher, you can simply edit the sequence file
> and move lines around. Nice and simple interface.
>
> There is no checking involved, though. If you mode dependent patches,
> you end up with a mess and either throw it all away or seriously
> scratch your head. So a serious SCM might do something like this:

just fyi, patchutils has a tool that can "flip" the order of patches
even if they patch the same line of code in the files.... with it you
can make a "bubble sort" to move stuff about safely...