From owner-svn-src-head@freebsd.org Sat Dec 26 06:21:17 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 C081F4D7DFF for ; Sat, 26 Dec 2020 06:21:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-25.consmr.mail.gq1.yahoo.com (sonic312-25.consmr.mail.gq1.yahoo.com [98.137.69.206]) (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 4D2tx82ppPz4vDN for ; Sat, 26 Dec 2020 06:21:14 +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=1608963673; bh=nenpRzIG3ZjuQxNdhNSJfJ+xB/ABNrODZlKBw+6vqjS=; h=Subject:From:Date:To:From:Subject; b=j0MHFOoZyBkq5T/vzI+DjMQHZN5Tsm5QdXBGOAanZA8OFofW2LxMMZtS6usNpVAffiCkvRhgwa5tW0KP+o5pxTdLQ8wvePwhIL5pGeFYg98WSfaNuTnLq4PWmdymyIOFg2T34KH133LT9OTI6oHcQv7Fsrnf989gVPSVUeZ7PjbbQEn8fcgfhXvQk/7I1Tu3zIxrZW+8B9/xig6wroFwRON6udsq/66o+HhJpq1DiUcJonebAj8jX9g3J2kch5r1SJfdhcqDDmrtCnPef1tT+2oym+SC+D5advqGWTY1pWe1Qy3mR2fzqSYQGV/hShgVMSFSQ5DR3IBzD7eoBmDD8Q== X-YMail-OSG: Jph2zSwVM1lJzjkyp0Q9q_I_cmM7muM4iC_RlDJo5Hsle7qYgbamwZGbabF1iy1 KR.JfMdxREZkvu589fKr._9ttHgbEXIrVqgi0vimWgoPrftPADueJtEcotiOWEkUBx1GQpkqob4n lVozFfHwojSbj6FZAhKwe9LMbv5ORpLe__5hKB0Z4zhBJVD8OJyTQFTYmDAEimyqEddI7dRh0Int XJK9ksKq80YsxyjSKgH.oK7KgJnv5QUUu8xA_5JqB7kRyuUB7ExqtaCHUkXljq5Nb4UXo0RXe5R. Gd4ONzdTrfW4IUqXawP8BJhhYkTNCk0Hkby7ZfkwloUlfA0lJcTLGr.zjcg3AqCrJZ0FRxn37ZuG RdSJiCHtAw5KGK6MR21Gfy6YUIvZH2pfxGOBj7ReK1ZOUKaBcz_CnnT1w1DgH1fOF5TP.GOIAZUG CML6vzqU9opVXDX312chARIBUFh.LNgsLuFIzAbVkT.Y8pjuo8rzqIt14bkCG7ZdagPUx7GgIKw8 TC2eOZSTGzGWwfiF4jfX7jCTls0EhIclUDqPGK35Ah59myvgZHykbK5NBIIBaZzcu0RoDvPwreYk yulhufsTriazv9W4ud9TmHpboD1.IqV.GUciQIEYKJYtYTwlxN.ZZx48Dno0cvMjx031L1ChTjPJ 3elVZqC8ABYcFr03agSUISPMEEgFr56o4._BPalMtRB2_Ph_g4fFmuaTT.wB6_Dr9IabKEW3A9da h5zwtB_OhNeOwXy.BOUm2UqS0RhK.YucSxZLVwI7G8FBU02WTmY8DeN.2TDNBCt.Wf.GG8.Cigus UHmKgOXfmUTxn1EuKtswaPKI2rF1d1J_.ZRUwKGdK3rp8oc2z2XkQbKSwFVLDM6qo_ejmlt7lzrC 0UCsSuz.Otb396pbe9IcvSrp5m.JroJh38aywArjxQVNQoFO_ed.Ji6f.j4PQEq7ykRIHbC.Aqv0 V1GISDcw2XxmqU1wufYo6e2mCO8Zfi5MjB1zru3apSYSlK5WaUQCSHJBLLnyzeHfTQkDJpClX7qu X1C3FPYRdosB_VcWoG1oYS1CgzXJeuLSUXEZBjvj4HtplmX91k1B2lg6PlqJ98lhNzuMteIR0Auz ktFCBySO349SISrVQX0i8C18ha68lgqn7bym9nEG9nECtEoizUs9wUJZW1EeOE9QcoOwBtOI1.he 5Vhrpuztcac8l0D4OQBLVJa18oCUsxGCUqeNJFd81GKWn2bUdITreBs4ms22Dx4kwlJHFl6UxMA6 aCa4zTvtMv3HA.xJ9V0rZ4cVuxznYovWm73JXn.juLgtSHqMkM6aDjVHhNKvZynzeR1Mq2ZiYjAm DsR0PxDH5avdRNfS63zNgtjztue7qtYuj28LyUNgTaPr2bPeMODtwlzO.66TMexWpSessncM7v9T VLXanj3jZMaYW7h.hfCKa5Roxc.6HKnoXC58ElO0eHUc3_4M9SN1c750xTIZc_9J47dz01Pvqmix lxawe40erowed5C._BtBiIhj6MbHXxoem6WkvijiEPA3ITb1RzdvObb2eNezvIP7TTxFiAU2U5I1 ZqIXBmn8ksx1hLK6FsocDHXspq64pPSkzi9igUUW2exNYKatI5Qn0JCq3VhS4kueHO_sVQ2cLSp2 N0ubN6uFY7TJQ.7Yzkne2TH3J1GFg4MxP84Hb.XPEcvWrZOih2nl1YD.E35T_0jXZY1MryikNpUc 5DZiJSw2NE5HCYcHzgLpHgei3Krvkfj8MKTxWCvmU.iOlPKoZonJOAf1CTyNKmF8zX0ce8obfwpH g6.XXbGqpzrNRJ9o8BBpNWQovZ_R9RajmIx6wiw6epBgu6fe2ordz3mBgHztGHBCo4_fXFdHG7LU m.auyFfOx2NtIHXLH3xf8688OpdnqJPse.1MG5kJKwUuQNLb80BzpkI8.TJcsTr5Ho1WtN417XnB 6pkrfuB4EmpE2SoZ7qIUMTIjC5cb_uhG12Ww7thjCDc0COMR2cS80MiQMRo_yG4uF6qJR2QOTDYA e73UCCq.o9hfix2vV7GhCGEIVe.M4M3w52TtAvtJd.hbBtLx6zCBy64qJkRaZL0pEk.ThxnMKhVM PUZt5_toURfumxFb15Z3lsPoF1YfHPh3pcqcBLzk.hXA.5ZyTkZZWsK8UHBrGHN46ZAGH0crLGQD VZzFGL6to3DM_Ze6spOsHIjafnG6F21LH0yPFY0o61lrfQrjWoWIG4KZbch5PTkCxFWpx6jn0maq GN259omaf.MDq03BasE9qRRX_0dc_fwbueTznSuZjDzG0gW4gxB1lBy60CZEha5MheJT5e7mPCRH fTJJR_lVmE8taIKtoEgqwKkNLrk7w1BCkEdXXL72X8ZXXt9jBlUPtewbGxTZ4pjCLgbizsUtnpBr Jxf76vNtbcn22b8GeoZrSRE81nhIBqxb57gb_OOcHyyxoCXkpbdiuQHpV3ep6rhS3BL2S1LZ39RX l7O8dZtVzbC0t5dQrHMlsDhVtskh1GYN2_hs5L7lbSMdOI7HwV6.0XPE- Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Sat, 26 Dec 2020 06:21:13 +0000 Received: by smtp415.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 17010274051281d926f6507f0406dcfb; Sat, 26 Dec 2020 06:21:09 +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: <018DC607-28A9-4937-B5C5-10C5C1B06C43@yahoo.com> Date: Fri, 25 Dec 2020 22:21:07 -0800 Cc: svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5354B066-58AF-4F81-A665-F727F4C264F6@yahoo.com> References: <018DC607-28A9-4937-B5C5-10C5C1B06C43@yahoo.com> To: o.hartmann@walstatt.org X-Mailer: Apple Mail (2.3654.20.0.2.21) X-Rspamd-Queue-Id: 4D2tx82ppPz4vDN 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]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.206:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; 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.69.206:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.206:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.206: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:21:17 -0000 > 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 : . . . I've done more exploring and so am more willing to be explicit about commands now that I've tried some of this. >> 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 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 . . . https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md has as its = first question: "How do I track -current and -stable with only one copy of the repo?" So = based on that text . . . The notations for the git branches for what you list are (in order): stable/12 releng/12.1 releng/12.2 main The later material will lead to there being 4 FreeBSD source trees (with = my arbitrary example paths that you might not want to use): /usr/fbsd/freebsd-current/ /usr/fbsd/freebsd-stable-12/ /usr/fbsd/freebsd-releng-12.1/ /usr/fbsd/freebsd-releng-12.2/ 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. The initial setup (I picked an example URL): # 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 Then, as an example of updating freebsd-current (the overall sequence = follows the FAQ but I'll note a variation later): # cd /usr/fbsd/freebsd-current # git checkout main # git pull --ff-only 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. # 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 I'll note that elsewhere it is recommended to do (once for each login using git for FreeBSD source activity): # git config --global pull.ff only 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.) The variation that I mentioned follows . . . 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. 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. # cd /usr/fbsd/freebsd-current # git fetch freebsd # git checkout main # git merge --ff-only freebsd/main vs. # cd /usr/fbsd/freebsd-current # git fetch freebsd # cd /usr/fbsd/freebsd-stable-12 # git checkout stable/12 # git merge --ff-only freebsd/stable/12 vs. # cd /usr/fbsd/freebsd-current # git fetch freebsd # cd /usr/fbsd/freebsd-releng-12.1 # git checkout releng/12.1 # git merge --ff-only freebsd/releng/12.1 vs. # cd /usr/fbsd/freebsd-current # git fetch freebsd # cd /usr/fbsd/freebsd-releng-12.2 # git checkout releng/12.2 # git merge --ff-only freebsd/releng/12.2 Note: After a fetch, one or more of the cd-checkout-merge sorts of sequences could be done without re-fetching. 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. 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. Not tied to that, you may want to look at: https://github.com/bsdimp/freebsd-git-docs/blob/main/SUMMARY.md 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)