From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUVAD-0004DH-O7 for qemu-devel@nongnu.org; Tue, 15 May 2012 23:44:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUVAB-0002c1-GQ for qemu-devel@nongnu.org; Tue, 15 May 2012 23:44:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60052 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUVAB-0002a1-7M for qemu-devel@nongnu.org; Tue, 15 May 2012 23:44:35 -0400 Message-ID: <4FB3229C.1030707@suse.de> Date: Wed, 16 May 2012 05:44:28 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <4FB180FF.40202@suse.de> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] x86 AREG0 patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: Peter Maydell , qemu-devel , Alexander Graf Am 15.05.2012 19:22, schrieb Blue Swirl: > On Mon, May 14, 2012 at 10:02 PM, Andreas F=C3=A4rber wrote: >> Am 13.05.2012 23:04, schrieb Blue Swirl: >>> A preview of x86 AREG0 patches can be found at the usual place: >>> URL git://repo.or.cz/qemu/blueswirl.git >>> http://repo.or.cz/r/qemu/blueswirl.git >> >> It looks like that push has completely replaced your pending ppc conve= rsion? >=20 > Yes, I popped the StGit series before working on this, sorry. I really > should try to use git branches. If this StGit uses only one master branch, you can at least archive multiple branches using git push repo master:areg0-ppc with repo as remote, master as local source branch and areg0-ppc as remote destination branch name. Locally you could create a branch with `git branch branchname`. `git branch` tells you which branch you are on and `git checkout branchname` switches between them. Pretty easy actually. The harder part is organizing your branches in a way matching your workflows - I tend to do lots of stuff in parallel, so by now I use at least ten local repositories to avoid switching between branches and wasting time with lengthy rebuilds, for working on different topics (e.g., master, 0.15, ppc-next, s390-next, ARM, QOM). I think Peter mentioned using StGit, and he maintains branches for his PULLs. >> If someone needs it for testing I still have a rebased version here: >> http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/ppc >=20 > Would you like to start maintaining them in your queue? I don't want qom-next to turn into a general-purpose master replacement. Instead I would like Alex as ppc maintainer to decide on a sequence for applying our series to ppc-next, and I'd either pull or cherry-pick the QOM-related parts from there (don't think we have a conflict so far). Note that my branch doesn't properly fix the build issue, it just added a quick build fix on top for testing. On Alex' branch it seemed fixed properly but wasn't rebased yet when I tested tcg/ppc64. Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg