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: David Vrabel: 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 David Vrabel" href="/groupie.php?aid=1125" /><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/64" onclick="this.href='/lkml/headers'+'/2005/4/7/64';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/7/64">[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/20">David Woodhouse</a><ul><li><a href="/lkml/2005/4/7/54">Andrew Morton</a><ul><li><a href="/lkml/2005/4/7/59">Paul Mackerras</a><ul><li><a href="/lkml/2005/4/7/66">Andrew Morton</a><ul><li><a href="/lkml/2005/4/7/88">Paul Mackerras</a></li></ul></li><li><a href="/lkml/2005/4/7/84">Geert Uytterhoeven</a></li></ul></li><li><a href="/lkml/2005/4/7/61">David Woodhouse</a><ul><li><a href="/lkml/2005/4/7/68">Andrew Morton</a></li><li><a href="/lkml/2005/4/7/71">Russell King</a><ul><li><a href="/lkml/2005/4/7/75">David Woodhouse</a></li></ul></li></ul></li><li class="origin"><a href="">David Vrabel</a></li></ul></li><li><a href="/lkml/2005/4/7/60">Sergei Organov</a><ul><li><a href="/lkml/2005/4/7/81">Matthias Andree</a><ul><li><a href="/lkml/2005/4/7/85">Andrew Walrond</a></li><li><a href="/lkml/2005/4/9/73">David Roundy</a><ul><li><a href="/lkml/2005/4/10/16">Giuseppe Bilotta</a></li></ul></li></ul></li></ul></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><a href="/lkml/2005/4/7/185">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/7/192">=?iso-8859-1?Q?J=F6rn?= Engel</a></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></li><li><a href="/lkml/2005/4/8/198">Jon Masters</a></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></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></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, 07 Apr 2005 10:40:51 +0100</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">David Vrabel <></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">Andrew Morton wrote:<br />> David Woodhouse <dwmw2@infradead.org> wrote:<br />> <br />>> One feature I'd want to see in a replacement version control system is<br />>> the ability to _re-order_ patches, and to cherry-pick patches from my<br />>> tree to be sent onwards.<br />> <br />> You just described quilt & patch-scripts.<br />> <br />> The problem with those is letting other people get access to it. I guess<br />> that could be fixed with a bit of scripting and rsyncing.<br /><br />Where I work we've been using quilt for a while now and storing the<br />patch-set in CVS. To limit the number of potential stuff-ups due to two<br />people working on the same patch at the same time (the chance that CVS's<br />merge will get it right is zero) we use CVS's locking feature to ensure<br />that only one person can edit/update a patch or the series file at any<br />one time. It seems to work quite well (though admittedly there's only<br />two developers working on the patch-set and it currently contains a mere<br />61 patches).<br /><br />We also have a few scripts to ensure we always due the correct locking.<br /> The main ones are:<br /><br />qec -- to edit a file either as part of the top 'working' patch or as an<br />existing patch. It does the quilt push which I always forget to do<br />otherwise.<br /><br />qrefr -- like quilt refresh only it locks the patch first.<br /><br />qimport -- like quilt import only it locks the series file first.<br /><br />You can grab a tarball of these (and other, less interesting ones) from<br /><br /><a href="http://www.davidvrabel.org.uk/quilt-n-cvs-scripts-1.tar.gz">http://www.davidvrabel.org.uk/quilt-n-cvs-scripts-1.tar.gz</a><br /><br />Note that I'm providing this purely on an as-is basis in case any one is<br />interested.<br /><br />And I've just realized I can't remember how exactly to set up the CVS<br />repository of the patch-set. I think you need to do a cvs watch on when<br />it's checked-out.<br /><br />David Vrabel<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: 2005-04-07 11:44 聽聽 [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>