Messages in this thread | | | From | Daniel Phillips <> | Subject | Re: Kernel SCM saga.. | Date | Thu, 7 Apr 2005 14:27:03 -0400 |
| |
On Thursday 07 April 2005 14:04, Jörn Engel wrote: > On Thu, 7 April 2005 10:47:18 -0700, Linus Torvalds wrote: >> ... 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: > > $ cp series new_series > $ vi new_series > $ SCM --reorder new_series > # essentially "mv new_series series", if no checks fail > > Merging patches isn't that hard either. Splitting them would remain > manual, as you described it.
Well it's clear that adding cherry picking, patch reordering, splitting and merging (two patches into one) is not even hard, it's just a matter of making it convenient by _building it into the tool_. Now, can we just pick a tool and do it, please? :-)
Regards,
Daniel - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |