CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Linus Torvalds: Re: Kernel SCM saga..</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Linus Torvalds" href="/groupie.php?aid=1" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/4"> [Apr]</a> 聽 <a class="nb" href="/lkml/2005/4/7"> [7]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/4/7/185" onclick="this.href='/lkml/headers'+'/2005/4/7/185';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/7/185">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/4/6/121">First message in thread</a></li><li><a href="/lkml/2005/4/7/150">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/7/175">Daniel Phillips</a></li><li><a href="/lkml/2005/4/7/176">Al Viro</a><ul><li class="origin"><a href="/lkml/2005/4/7/192">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/7/192">=?iso-8859-1?Q?J=F6rn?= Engel</a><ul><li><a href="/lkml/2005/4/7/199">Daniel Phillips</a></li><li><a href="/lkml/2005/4/7/237">Arjan van de Ven</a></li></ul></li><li><a href="/lkml/2005/4/7/326">Jeff Garzik</a></li></ul></li><li><a href="/lkml/2005/4/7/188">Bartlomiej Zolnierkiewicz</a></li><li><a href="/lkml/2005/4/7/190">Daniel Phillips</a><ul><li><a href="/lkml/2005/4/7/197">Dmitry Yusupov</a><ul><li><a href="/lkml/2005/4/7/200">Daniel Phillips</a></li></ul></li><li><a href="/lkml/2005/4/8/198">Jon Masters</a><ul><li><a href="/lkml/2005/4/8/274">Daniel Phillips</a></li></ul></li></ul></li></ul></li><li><a href="/lkml/2005/4/8/289">Roman Zippel</a><ul><li><a href="/lkml/2005/4/8/299">Tupshin Harper</a><ul><li><a href="/lkml/2005/4/8/314">Roman Zippel</a><ul><li><a href="/lkml/2005/4/8/327">Tupshin Harper</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/9/79">"Eric D. Mudama"</a><ul><li><a href="/lkml/2005/4/9/85">Roman Zippel</a><ul><li><a href="/lkml/2005/4/9/100">Ray Lee</a></li></ul></li></ul></li></ul></li></ul></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 7 Apr 2005 10:47:18 -0700 (PDT)</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Linus Torvalds <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: Kernel SCM saga..</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody"><br /><br />On Thu, 7 Apr 2005, Al Viro wrote:<br />> <br />> No. There's another reason - when you are cherry-picking and reordering<br />> *your* *own* *patches*.<br /><br />Yes. I agree. There should be some support for cherry-picking in between a<br />temporary throw-away tree and a "cleaned-up-tree". However, it should be<br />something you really do need to think about, and in most cases it really<br />does boil down to "export as patch, re-import from patch". Especially<br />since you potentially want to edit things in between anyway when you<br />cherry-pick.<br /><br />(I do that myself: If I have been a messy boy, and committed mixed-up <br />things as one commit, I export it as a patch, and then I split the patch <br />by hand into two or more pieces - sometimes by just editing the patch <br />directly, but sometimes with a combination of by applying it, and editing <br />the result, and then re-exporting it as the new version).<br /><br />And in the cases where this happens, you in fact often have unrelated<br />changes to the _same_file_, so you really do end up having that middle <br />step.<br /><br />In other words, this cherry-picking can generally be scripted and done<br />"outside" the SCM (you can trivially have a script that takes a revision<br />from one tree and applies it to the other). I don't believe that the SCM<br />needs to support it in any fundamentally inherent manner. After all, why <br />should it, when it really boilds down to <br /><br /> (cd old-tree ; scm export-as-patch-plus-comments) |<br /> (cd new-tree ; scm import-patch-plus-comments)<br /><br />where the "patch-plus-comments" part is just basically an extended patch<br />(including rename information etc, not just the comments).<br /><br />Btw, this method of cherry-picking again requires two _separate_ active <br />trees at the same time. BK is great at that, and really, that's what <br />distributed SCM's should be all about anyway. It's not just distributed <br />between different machines, it's literally distributed even on the same <br />machine, and it's actively _used_ that way.<br /><br /> Linus<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2009-11-18 23:46 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>