From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.96.1574817311606288638 for ; Tue, 26 Nov 2019 17:15:11 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: michael.d.kinney@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 17:15:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,247,1571727600"; d="scan'208";a="199014279" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by orsmga007.jf.intel.com with ESMTP; 26 Nov 2019 17:15:11 -0800 Received: from orsmsx124.amr.corp.intel.com (10.22.240.120) by ORSMSX107.amr.corp.intel.com (10.22.240.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 26 Nov 2019 17:15:10 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.200]) by ORSMSX124.amr.corp.intel.com ([169.254.2.83]) with mapi id 14.03.0439.000; Tue, 26 Nov 2019 17:15:10 -0800 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "afish@apple.com" , "Kinney, Michael D" Subject: Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date. Thread-Topic: [edk2-devel] [staging/master]:master on edk2-staging is out of date. Thread-Index: AQHVpKJWiIaaJzoG6k6tl/9zkRxMd6ed/t8QgACwM4D//4b+oA== Date: Wed, 27 Nov 2019 01:15:09 +0000 Message-ID: References: <8019E4CE-A2D8-465B-BBAB-F2E9B26C2E20@apple.com> In-Reply-To: <8019E4CE-A2D8-465B-BBAB-F2E9B26C2E20@apple.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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 On > Behalf Of Andrew Fish via Groups.Io > Sent: Tuesday, November 26, 2019 4:25 PM > To: devel@edk2.groups.io; Kinney, Michael D > > Subject: Re: [edk2-devel] [staging/master]:master on > edk2-staging is out of date. >=20 >=20 >=20 > > On Nov 26, 2019, at 2:08 PM, Michael D Kinney > 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 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 > > =09a) edk2-staging is a fork of edk2 > > =09b) edk2-staging/master tracks edk2/master > > >=20 > Mike, >=20 > 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? >=20 > Thanks, >=20 > Andrew Fish >=20 >=20 > > > > > > >=20 >=20 >=20