From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHmF6-0003yn-AA for qemu-devel@nongnu.org; Tue, 28 Jun 2016 02:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHmF1-00040W-6f for qemu-devel@nongnu.org; Tue, 28 Jun 2016 02:11:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHmF0-00040K-UT for qemu-devel@nongnu.org; Tue, 28 Jun 2016 02:11:23 -0400 Date: Tue, 28 Jun 2016 02:11:19 -0400 From: Jeff Cody Message-ID: <20160628061119.GJ3448@localhost.localdomain> References: <87ca06506c68e50a482fe33d0c86a438dc83fbe7.1466487614.git.jcody@redhat.com> <20160621102818.GH32560@stefanha-x1.localdomain> <576945BE.6070101@ilande.co.uk> <09d16f11-6d86-83b3-50a0-449196070514@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <09d16f11-6d86-83b3-50a0-449196070514@ilande.co.uk> Subject: Re: [Qemu-devel] [RFC PATCH 1/1] OpenBIOS: Switch over to official OpenBIOS git repo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Cave-Ayland Cc: Stefan Hajnoczi , peter.maydell@linaro.org, agraf@suse.de, qemu-devel@nongnu.org, afaerber@suse.de On Mon, Jun 27, 2016 at 07:48:23AM +0100, Mark Cave-Ayland wrote: > On 21/06/16 14:48, Mark Cave-Ayland wrote: > > > On 21/06/16 11:28, Stefan Hajnoczi wrote: > > > >> On Tue, Jun 21, 2016 at 01:40:42AM -0400, Jeff Cody wrote: > >>> This update should preserve git history, and allow seamless switching > >>> over to the official openbios git repo, rather than pulling from the > >>> svn mirror. All prior history from the svn repository should still be > >>> preserved (i.e., commit hashes are the same for historical commits). > >>> > >>> In the roms/openbios submodule, the branch "origin/official" is the > >>> latest mirror of the official git repository (fetched daily). > >>> > >>> Signed-off-by: Jeff Cody > >>> --- > >>> roms/openbios | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> Assuming the git.qemu-project.org openbios.git remote and .git/config > >> mirror setting has been updated to use the new upstream git repo: > >> > >> Reviewed-by: Stefan Hajnoczi > > > > Is it possible to switch this around, so that there is a legacy branch > > which points to the current HEAD and master points to the new, upstream > > git HEAD? Then it means if someone clones either the > > git.qemu-project.org repository or the official repository then the > > default master branch will point to the same HEAD. > > Urgent ping? It has been another week, we're coming up to soft freeze > and the PPC guys are urgently after an OpenBIOS fix. > > As per the above I'd really like the branches switched around so that > both the git.qemu-project.org master and github.com master are exactly > the same HEAD although I believe it may be technically possible to do > this part separately once the HEAD switch is in? If so, please can we > apply this and then I can line up and attempt to push the outstanding > patches to the new github master later this evening. > If we want something other than this patch, so that the openbios git repo hosted on qemu.org has 'master' as the new github tracking, we might be able to do that with a git-merge. Here are the three methods I am thinking of: A) For 'master' referencing new github hashes: git fetch github git merge --no-edit github/master git push /pub/git/openbios.git master:master B) Old, prior behavior for SVN: git svn fetch svn git merge git-svn git push /pub/git/openbios.git master:master C) Current behavior, as of the submitted patch above, this is what is being run: git svn fetch svn git merge git-svn git fetch github git push /pub/git/openbios.git master:master git push /pub/git/openbios.git official:official (This seemed safest to run, as old behavior remains unchanged) If we do A), we'll have merge commits with just the auto-generated merge message, and I'm not sure this is what you want. Thoughts? Jeff