From owner-svn-src-head@freebsd.org Sat Dec 26 06:47:03 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF0294B0633 for ; Sat, 26 Dec 2020 06:47:03 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-8.consmr.mail.gq1.yahoo.com (sonic315-8.consmr.mail.gq1.yahoo.com [98.137.65.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2vVt4VPZz4vt7 for ; Sat, 26 Dec 2020 06:47:02 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1608965220; bh=OOlukaNe8wZzmceqwk/EklGZsA2NuH3nE4+rN4CzD40=; h=Subject:From:Date:To:From:Subject; b=guJ5/Z+8X0rpxEYTe1D7syQmxZor9gmwqgMl3+T+220hCXYbqGiUV3a4R25LawBy++ST/YuAbaRfP1rWnZ58j+gnRQ0FGfUVJRAIATAMxbkCLMZnLwgJgYSahIIFsFvikJDlWIIu2vBaa5MIwRK6t4iEbss1X70PBoPZMw1TC6y0haBsWAyg0mCEfYRzcrK3S7jUkIz/X65dB2Jnn1wpBwNx2G1130X7Oad1QISo4pW/lEfLBr+EYkI1JHDgUIidanZQ5A0yelOKg4uAP5ZTL3nJ/SfRnpcrwpL8flTcsEq7ryXlal7mkkLHsMN2oa4N9g0QoP9MP5c8NcV1ZC/8oA== X-YMail-OSG: 5lbTnCcVM1nesimgpjAn5uAbDAPznsDA6tYoiVyT0wknJJq9FAr.NKN_XdiWY3O UIqMF9i82SeKonsMX1wTa7Htsyranxw27bgDdnewqzLomet32ZhPM3oWsn8SX_115Ry3Dicy8pkW 57dT8mm03IzisktQ.Sjq.PA5qrp.1ycQ1EyTRv8_A72bjxUGSM4pcvyn05UY9g3Lyc2x32vbjX0a NHH0HWkct72CIZoapT3GehZ8Oivlbw97AHNVaCRsmnXrBfcMCzNNj5uRA_D6rMxpRfHGvdAls8aO GvQuF.eqz1z6bKp3FcTQBYnHwsQm_kpOnxax7ToB2sXbDu7hcqAQNmDqEZWfTI_47Oy2TuTrSUPt EPZItS1TPGa12vbZp3103R.H467lRHEgD1PhUOGtzHeEAvguXzR8g9lEBtDXv.qvymXkuwlRL8fO h8k0aZwNQ59AeLdI0Hl1Ef94P8oCslEWV8CcO8wap8.DXoNKoFSby_URdiw_4iWPz.yT5NMJ7eZ2 cYfT8BHAFN8aKESYG2ohrOoO1xRfBL8PxCIWzg.kIbvPfkaCIcjyw73TJhri8PD1ooA2.U0d9s7f 555_GWyxmNhHgOvceXaCVpL5sgF.X86yB34SP1k6ZGrSB1TiNSA81y6P2mm7V0Z4WM3y8p.Eh._8 qggD1QA_btH7eDHhz2ek9w.aq7sdJ1shFFvQAxjCVE08ZfSRA.hk2P.R162lmxMMr9RDJ3A35m0B 0hgb04LVnR.2WyQfWlyCK9jWmgaa22lt_XMWUPLHg1GxqN6y.4sDas5CvBLpTneYZldZQdhbl15z taP6djTWODLJfL1NVhXcyyTLW8ofFQFXdtunNXoC1cgYR8P_NRkIMmdf2w9XuFeUDSzUY8KKkD3P shB9TpIRZJHlYeNcJOmtU2Xc4_o.DCKnVCwk7WMBJLcdP7Bi.Mv3oQHFTI8VgrSsJLGthpsVllUP 0xM3owFYgXq_mA15StJazUEEEAH6XOLRyfponkE3VLd3P48Q5abyTdUc6EIc9NCl0FwrTLKNAdox _._Mbz287BWwEylP1afvCp.MXrLH7nSt1vrK3W23xgGZjmRtuq0_g59GG8spXZXGiehlI8SR6ter jdQ19MrGUIqtWfUHmpFguk1bAEjjhO4hyOH7kwrsKX6Hkyp1OTewXQF.mLflYtOOCyf5YYzI1JJq assVnr15cs9k3iiPHShWYMW7TOO8BtgT8D2nbmLd3Q8lzyvIiZwfX0UfvGQuyxviZc.tAACBNWiA B.A1VTSCI0I_qrYJjCVlJV4ByUlao0sGPo0kbQ8fIH5FckQjDymOHKEY_bhpK_ro01zQk9NEPJ_v sYGW3dScqwcWTqshOIw_GuNz2ygRoBXMzr3mieluKjiBo96GTX48rnGx03Ujrwm07qJWin3BSibY e6NX62IKBa.X9E25TKHQxvrb9MfkPWaH_oislpudjHkR9wGEofnTduzwFfGLpBfqlPUpik.C8yx7 3bBzkHivM1Fa2q6.ik0sYfD93Z2G4rjuvAEeFttS6dXXkDu.G2kwSL6D4E_1EI8voLaSzBGWpeev WHsTIiFT12j5GNNSU7dh8hnPDO.JCrJl02XOgH_W63oZybbt6fXMaIT77jrWb9Q5CZ.RghwQc5_Y fGM4rYjzw2GYMGvjtA.joQ7zK5AwUQdUPVtqNRxv0G5plC.wx.QEQR151zfXOrFZyQJmB7DgPBgO fnr2GUGo5AegWZULZ4hoQ9mhAL6HdN2u5YVEdoRR5l5IfRpt.hauPyhkuUuJ0SjYSyM1nMmYDlK9 y.XI70I9nXKYLJc54n.R0oW.JW7swpFylDEosERe1FcgwxXSIo7VFvUAoOBDxfvKwiWbx9XtiQ_P ghalCMzrko1vqKIu7ZgrwLe4IO31czmjRldPz8I.Mjb_G0rhOcxpLRF69mqXo_UCzWwCTGbTGEvS hq5u6kMofkryeVzbb0eABGVdWpjqYYwnEDm0oSyP2V9jtZZgryTBQu8tVWyAdcgvPq2GW9GuPlIS PBPApBx0C5995kBjiK2UJkuJv8PTM6e1AkTuxZ7Ui6oTlQPlhqLOQLMet3lTymqo94MQcDwuW3tZ DcbfKtLLJbTW20KGchTwJdyORAFja1tnYfoL_72nGAcgqmwNicMic8oqW3GKudRkPJ0nRCRbDkfv VyOptTfWgGfjxzRTw6DWHs8h2BtoWYOgtZLPgmolPvQgMMg39ACoZcwORHP3F3NCv7RZg_xmmGZB KfU8PBCZVJbME71jlCt1.zHejiJjNAKYt78OuBoC4yA6imbyeaAbKFcDnmfSZ01RAD6IhLDoOQvW tL28WqlFJnNtPJya5Nsz8bgFG5DSYgtEyOG_XRG4GPDd4VhrcaOdRYhfqJ0n8Ue_Dh8OAslvD46g MSd.89nvRSHFI7BlcsTd9qElw3Tie3ZEVJbJUQDycOW5iko0HhfOuzmitU8O6NoNUiu4GabVWe9f 3zXboo0DYYQKKi6YmiUVQa3VYVUK92WI0xufgPMtjWdz9EoPFSPyVfYhl Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Sat, 26 Dec 2020 06:47:00 +0000 Received: by smtp414.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID d56913f8f62d690508504a933276e2d5; Sat, 26 Dec 2020 06:46:59 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.20.0.2.21\)) Subject: Re: svn commit: r368820 - head From: Mark Millard In-Reply-To: <5354B066-58AF-4F81-A665-F727F4C264F6@yahoo.com> Date: Fri, 25 Dec 2020 22:46:57 -0800 Cc: svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <018DC607-28A9-4937-B5C5-10C5C1B06C43@yahoo.com> <5354B066-58AF-4F81-A665-F727F4C264F6@yahoo.com> To: o.hartmann@walstatt.org X-Mailer: Apple Mail (2.3654.20.0.2.21) X-Rspamd-Queue-Id: 4D2vVt4VPZz4vt7 X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.65.32:from]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.65.32:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.32:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.32:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-head] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 06:47:03 -0000 On 2020-Dec-25, at 22:21, Mark Millard wrote: >> On 2020-Dec-24, at 21:17, Mark Millard wrote: >>=20 >> Hartmann, O. o.hartmann at walstatt.org wrote on >> Thu Dec 24 21:34:56 UTC 2020 : > . . . Looks like I was over specific about where I did "git fetch" from and so made some sequences overcomplicated. So I adjust that this time. > I've done more exploring and so am more willing to be > explicit about commands now that I've tried some of this. >=20 >>> I can not find (easily) any hints >>> for those who were familiar with subversion and checking out = /usr/src either for >>> 12-STABLE, 12.1-RELENG, 12.2-RELENG, CURRENT. >>=20 >=20 > Presuming having each available at the same time in separate directory = trees, > but only one repository, and sticking to the HEAD commit for each at = the time > the local repository is updated from the remote one. Also presuming no = locally > updated sources so there is nothing to clean up or put to the side . . = . >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md has as its = first question: >=20 > "How do I track -current and -stable with only one copy of the repo?" = So based > on that text . . . >=20 > The notations for the git branches for what you list are (in order): >=20 > stable/12 > releng/12.1 > releng/12.2 > main >=20 > The later material will lead to there being 4 FreeBSD source trees = (with my > arbitrary example paths that you might not want to use): >=20 > /usr/fbsd/freebsd-current/ > /usr/fbsd/freebsd-stable-12/ > /usr/fbsd/freebsd-releng-12.1/ > /usr/fbsd/freebsd-releng-12.2/ >=20 > When following the general structure that uses worktrees that is = documented, you > can have at most one worktree for a branch. (Adding branches that you = maintain > to be related to those allows for more.) I'll indicate one worktree = for each but > main. main gets no worktree: it already has a sufficient context. >=20 > The initial setup (I picked an example URL): >=20 > # mkdir -p /usr/fbsd > # cd /usr/fbsd > # git clone -o freebsd --config = remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' \ > ssh://anongit@git.freebsd.org/src.git freebsd-current > # cd freebsd-current > # git checkout main > # git worktree add ../freebsd-stable-12 stable/12 > # git worktree add ../freebsd-releng-12.1 releng/12.1 > # git worktree add ../freebsd-releng-12.2 releng/12.2 >=20 > Then, as an example of updating freebsd-current (the overall sequence = follows > the FAQ but I'll note a variation later): >=20 > # cd /usr/fbsd/freebsd-current > # git checkout main > # git pull --ff-only >=20 > Note: For the below, the above needs to have been > done first: the pull involves the fetch of the > remote material, including for the use in the > below. >=20 > # cd ../freebsd-stable-12 > # git merge --ff_only freebsd/stable/12 > # cd ../freebsd-releng-12.1 > # git merge --ff_only freebsd/releng/12.1 > # cd ../freebsd-releng-12.2 > # git merge --ff_only freebsd/stable/12 >=20 > I'll note that elsewhere it is recommended to do (once > for each login using git for FreeBSD source activity): >=20 > # git config --global pull.ff only >=20 > because those --ff-only uses are important to keeping > history as FreeBSD intends it (linear) and --ff-only > can be a default. (This will not cover the below > variation.) >=20 >=20 > The variation that I mentioned follows . . . >=20 > You might not like needing to update freebsd-current in > order to update, say, freebsd-stable-12 above. Avoiding > the pull and using the analogous two commands in the > proper order gives the following that only update the > individual part of the fetch that was of interest. >=20 > I show binding to branches to directories explicitly > (checkout) but such would not be needed unless the > binding for the directory tree had been changed. Note > that the below is not using pull and so the config > above does not cause --ff-only defaults to be involved: > Be reliably explicit. >=20 >=20 > # cd /usr/fbsd/freebsd-current > # git fetch freebsd > # git checkout main > # git merge --ff-only freebsd/main >=20 > vs. >=20 Improved: # cd /usr/fbsd/freebsd-stable-12 # git fetch freebsd # git checkout stable/12 # git merge --ff-only freebsd/stable/12 > vs. >=20 Improved: # cd /usr/fbsd/freebsd-releng-12.1 # git fetch freebsd # git checkout releng/12.1 # git merge --ff-only freebsd/releng/12.1 > vs. >=20 Improved: # cd /usr/fbsd/freebsd-releng-12.2 # git fetch freebsd # git checkout releng/12.2 # git merge --ff-only freebsd/releng/12.2 >=20 > Note: After a fetch, one or more of the > cd-checkout-merge sorts of sequences could > be done without re-fetching. >=20 > Part of what a "merge --ff-only" does is to > move what the active branch refers to, in > the cases above, to a (potentially) new place > in newly fetched material. >=20 > I hope that the above helps. It does not deal with > picking out a specific commit out of the repository > for a specific source directory tree. I do not know > if you do such and it makes controlling the context > more complicated to describe. >=20 > Not tied to that, you may want to look at: >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/SUMMARY.md >=20 > that organizes the existing material and may make > it easier to pick out things to read. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)