[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [RFC PATCH 1/1] OpenBIOS: Switch over to official OpenB

From: Jeff Cody
Subject: Re: [Qemu-devel] [RFC PATCH 1/1] OpenBIOS: Switch over to official OpenBIOS git repo
Date: Tue, 28 Jun 2016 02:11:19 -0400
User-agent: Mutt/1.5.24 (2015-08-30)

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 <address@hidden>
> >>> ---
> >>>  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 <address@hidden>
> > 
> > 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?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]