From owner-freebsd-git@freebsd.org Tue Jan 26 02:45:43 2021 Return-Path: Delivered-To: freebsd-git@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 DD3A94FC688 for ; Tue, 26 Jan 2021 02:45:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPrh663jhz4ZDP for ; Tue, 26 Jan 2021 02:45:42 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 10Q2jeZP021484; Tue, 26 Jan 2021 02:45:40 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 10Q2je57021483; Mon, 25 Jan 2021 18:45:40 -0800 (PST) (envelope-from david) Date: Mon, 25 Jan 2021 18:45:40 -0800 From: David Wolfskill To: tech-lists Cc: freebsd-git@freebsd.org Subject: Re: git commands for checking out 13-stable Message-ID: Reply-To: freebsd-git@freebsd.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="JiQnolh6Px2hJQlO" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DPrh663jhz4ZDP X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-5.40 / 15.00]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 02:45:43 -0000 --JiQnolh6Px2hJQlO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 26, 2021 at 02:24:56AM +0000, tech-lists wrote: > Hi, >=20 > What are the git commands for: There are, undoubtedly, many different ways to do at least some of what you ask; making a good choice among them requires more knowledge of your requirements and a deeper understanding of how git works than I have. That said, while I haven't updated https://www.catwhisker.org/~david/FreeBSD/repo-sync.html specifically for stable/13, it's isomorphic to stable/12. More specifically, what I did/do: > 1. checking out 13/stable from a bare /usr/src # Initially: # Access my local mirror of https://git.freebsd.org/src.git. # Could use https://git.freebsd.org/src.git directly. git clone file:///repo/git/freebsd/src.git /usr/src git checkout stable/13 > 2. keeping this checkout up-to-date # Each morning (after my local mirror has been updated): git -C /usr/src pull > 3. same, but for 12/stable The above, but s/13/12/g (Well, mught want to think about where you want that working copy to be. On my machines where I track FreeBSD, I boot them from different slices to run different branches of FreeBSD, so /usr/src is the appropriate working copy for whatever branch I'm running, as each slice has its own root and /usr file systems.) > At what stage do we have to use etcupdate? rather than mergemaster I made the switch after about the 3rd day following the svn->git switch. Had I been a masochist, I could have continued using mergemaster. > thanks, > --=20 > J. Further details at links from the above-cited Web page. Peace, david --=20 David H. Wolfskill david@catwhisker.org Some "Republicans" seem bound and determined to turn the party known for touting "law and order" into one that supports mob rule and insurrection. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --JiQnolh6Px2hJQlO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmAPglRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnSCggAhIFgJl8EXkiB+nndVl/L6q132uz3GtApntS72fElnnrH+Ufjk5SwuIPR 2T+BSMjCduILg+hJpau9np/+rFeOfBCWi8c/Htx0Wkzp95fG/8SlwQaLaKaUvCyF FG0GKQRt+S8lfTIhyFevsUXp9ASRJJ/Aj7ubu6Bj59xV6vgpFWHZUzRN2T/pz959 P4uKZ2XxQW8QSSSun1kki+IFN4F4zMN2La0Fv3847cAxy5JIii29xX/jte4dzLWw +c7yOEBYhihamizXuSU4LBnYQqQzH5MNTTuuDcCiO1PLIvMMHKTVE3h/yTd5q1Tm I7oH9zWe1x0cJJJ4CjL42SK/DRcdjQ== =quMz -----END PGP SIGNATURE----- --JiQnolh6Px2hJQlO--