* [staging/master]:master on edk2-staging is out of date.
@ 2019-11-26 21:41 Andrew Fish
2019-11-26 22:08 ` [edk2-devel] " Michael D Kinney
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Fish @ 2019-11-26 21:41 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
I was looking at creating a staging branch to work on Bz2387. The README [1] for edk2-staging (about branch) mentions that edk2-staging/master tracks edk2/master, but I see it was last synced in June?
I'm not clear on the process for updating the edk2-staging/master? It is not setup to update on pull. There seems to have been a lot of work on the EmulatorPkg and I'd like to sync my staging branch with the current master if possible?
[1] https://github.com/tianocore/edk2-staging
[Step 1 is already completed, it is here for documentation purposes; proceed to 2)]
1) Create a new repo called edk2-staging
a) edk2-staging is a fork of edk2
b) edk2-staging/master tracks edk2/master
[-- Attachment #2: Type: text/html, Size: 1430 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date.
2019-11-26 21:41 [staging/master]:master on edk2-staging is out of date Andrew Fish
@ 2019-11-26 22:08 ` Michael D Kinney
2019-11-27 0:25 ` Andrew Fish
0 siblings, 1 reply; 4+ messages in thread
From: Michael D Kinney @ 2019-11-26 22:08 UTC (permalink / raw)
To: devel@edk2.groups.io, afish@apple.com, Kinney, Michael D
Hi Andrew,
The easiest way to create an edk2-staging branch based on the latest edk2/master is to clone edk2-staging and then add edk2 repo as a remote. Fetch edk2 and checkout edk2/master. Then create a local branch for Bz2387 based on edk2/master. When you want to share, push your local branch to edk2-staging.
git clone https://github.com/tianocore/edk2-staging.git
cd edk2-staging
git remote add edk2 https://github.com/tianocore/edk2.git
git fetch edk2
git checkout edk2/master -b Bz2387
git remote remove edk2
#
# Make local changes
#
#
# Push new branch to origin (https://github.com/tianocore/edk2-staging.git)
#
git push origin Bz2387
Mike
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Andrew Fish via Groups.Io
Sent: Tuesday, November 26, 2019 1:42 PM
To: devel@edk2.groups.io
Subject: [edk2-devel] [staging/master]:master on edk2-staging is out of date.
I was looking at creating a staging branch to work on Bz2387. The README [1] for edk2-staging (about branch) mentions that edk2-staging/master tracks edk2/master, but I see it was last synced in June?
I'm not clear on the process for updating the edk2-staging/master? It is not setup to update on pull. There seems to have been a lot of work on the EmulatorPkg and I'd like to sync my staging branch with the current master if possible?
[1] https://github.com/tianocore/edk2-staging
[Step 1 is already completed, it is here for documentation purposes; proceed to 2)]
1) Create a new repo called edk2-staging
a) edk2-staging is a fork of edk2
b) edk2-staging/master tracks edk2/master
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date.
2019-11-26 22:08 ` [edk2-devel] " Michael D Kinney
@ 2019-11-27 0:25 ` Andrew Fish
2019-11-27 1:15 ` Michael D Kinney
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Fish @ 2019-11-27 0:25 UTC (permalink / raw)
To: devel, Mike Kinney
> On Nov 26, 2019, at 2:08 PM, Michael D Kinney <michael.d.kinney@intel.com> wrote:
>
> Hi Andrew,
>
> The easiest way to create an edk2-staging branch based on the latest edk2/master is to clone edk2-staging and then add edk2 repo as a remote. Fetch edk2 and checkout edk2/master. Then create a local branch for Bz2387 based on edk2/master. When you want to share, push your local branch to edk2-staging.
>
> git clone https://github.com/tianocore/edk2-staging.git
> cd edk2-staging
> git remote add edk2 https://github.com/tianocore/edk2.git
> git fetch edk2
> git checkout edk2/master -b Bz2387
> git remote remove edk2
>
> #
> # Make local changes
> #
>
> #
> # Push new branch to origin (https://github.com/tianocore/edk2-staging.git)
> #
> git push origin Bz2387
>
> Mike
>
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Andrew Fish via Groups.Io
> Sent: Tuesday, November 26, 2019 1:42 PM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [staging/master]:master on edk2-staging is out of date.
>
> I was looking at creating a staging branch to work on Bz2387. The README [1] for edk2-staging (about branch) mentions that edk2-staging/master tracks edk2/master, but I see it was last synced in June?
>
> I'm not clear on the process for updating the edk2-staging/master? It is not setup to update on pull. There seems to have been a lot of work on the EmulatorPkg and I'd like to sync my staging branch with the current master if possible?
>
> [1] https://github.com/tianocore/edk2-staging
>
> [Step 1 is already completed, it is here for documentation purposes; proceed to 2)]
> 1) Create a new repo called edk2-staging
> a) edk2-staging is a fork of edk2
> b) edk2-staging/master tracks edk2/master
>
Mike,
Thanks for the instructions that makes sense. The README on the edk2-staging about branch seemed to imply I needed to use the edk2-staging/master branch? In retrospect that was probably more of me assuming the wrong thing?
Thanks,
Andrew Fish
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date.
2019-11-27 0:25 ` Andrew Fish
@ 2019-11-27 1:15 ` Michael D Kinney
0 siblings, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2019-11-27 1:15 UTC (permalink / raw)
To: devel@edk2.groups.io, afish@apple.com, Kinney, Michael D
Andrew,
It is a challenge to keep two branches in sync. Requires automated
scripts to periodically check for new commits and mirror them to
another branch.
It may be better to delete edk2-staging/master and update the
instructions to use a remote to edk2.
Mike
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On
> Behalf Of Andrew Fish via Groups.Io
> Sent: Tuesday, November 26, 2019 4:25 PM
> To: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] [staging/master]:master on
> edk2-staging is out of date.
>
>
>
> > On Nov 26, 2019, at 2:08 PM, Michael D Kinney
> <michael.d.kinney@intel.com> wrote:
> >
> > Hi Andrew,
> >
> > The easiest way to create an edk2-staging branch
> based on the latest edk2/master is to clone edk2-
> staging and then add edk2 repo as a remote. Fetch edk2
> and checkout edk2/master. Then create a local branch
> for Bz2387 based on edk2/master. When you want to
> share, push your local branch to edk2-staging.
> >
> > git clone https://github.com/tianocore/edk2-
> staging.git
> > cd edk2-staging
> > git remote add edk2
> https://github.com/tianocore/edk2.git
> > git fetch edk2
> > git checkout edk2/master -b Bz2387
> > git remote remove edk2
> >
> > #
> > # Make local changes
> > #
> >
> > #
> > # Push new branch to origin
> (https://github.com/tianocore/edk2-staging.git)
> > #
> > git push origin Bz2387
> >
> > Mike
> >
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On
> Behalf Of Andrew Fish via Groups.Io
> > Sent: Tuesday, November 26, 2019 1:42 PM
> > To: devel@edk2.groups.io
> > Subject: [edk2-devel] [staging/master]:master on
> edk2-staging is out of date.
> >
> > I was looking at creating a staging branch to work on
> Bz2387. The README [1] for edk2-staging (about branch)
> mentions that edk2-staging/master tracks edk2/master,
> but I see it was last synced in June?
> >
> > I'm not clear on the process for updating the edk2-
> staging/master? It is not setup to update on pull.
> There seems to have been a lot of work on the
> EmulatorPkg and I'd like to sync my staging branch with
> the current master if possible?
> >
> > [1] https://github.com/tianocore/edk2-staging
> >
> > [Step 1 is already completed, it is here for
> documentation purposes; proceed to 2)]
> > 1) Create a new repo called edk2-staging
> > a) edk2-staging is a fork of edk2
> > b) edk2-staging/master tracks edk2/master
> >
>
> Mike,
>
> Thanks for the instructions that makes sense. The
> README on the edk2-staging about branch seemed to imply
> I needed to use the edk2-staging/master branch? In
> retrospect that was probably more of me assuming the
> wrong thing?
>
> Thanks,
>
> Andrew Fish
>
>
> >
> >
> >
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-27 1:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-26 21:41 [staging/master]:master on edk2-staging is out of date Andrew Fish
2019-11-26 22:08 ` [edk2-devel] " Michael D Kinney
2019-11-27 0:25 ` Andrew Fish
2019-11-27 1:15 ` Michael D Kinney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox