From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: kvm repository unification Date: Tue, 20 Mar 2007 15:46:19 +0200 Message-ID: <45FFE5AB.3030501@qumranet.com> References: <45FFCFD7.5000107@qumranet.com> <200703201420.10139.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Arnd Bergmann Return-path: In-Reply-To: <200703201420.10139.arnd-r2nGTMty4D4@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org Arnd Bergmann wrote: > On Tuesday 20 March 2007, Avi Kivity wrote: > >> Managing userspace in subversion and the kernel in git is proving to be >> quite a pain. Branches have to be maintained in parallel, tagging is >> awkward, and bisection is fairly impossible. >> >> What do people think about putting libkvm and qemu into the usr >> directory of the kernel repo? It's slightly wierd but will make life >> generally easier. >> > > In my projects, I tend to never have a complete kernel tree under > revision control, only patches in a form suitable for 'quilt mail'. > This makes it a lot easier to see how the patches will look when they > get merged upstream. > > How does that work with multiple developers? I find that git's cherry-pick and history editing features to be almost as easy to use as quilt when it comes to managing patches; added to the ease of distributed development I think it has a clear edge over quilt. [I used to use quilt to cherry pick out of the subversion tree. Nowadays I just cherry pick what I want to send upstream and put it on a branch] -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV