Date: Mon, 25 Jan 2021 18:45:40 -0800 From: David Wolfskill <david@catwhisker.org> To: tech-lists <tech-lists@zyxst.net> Cc: freebsd-git@freebsd.org Subject: Re: git commands for checking out 13-stable Message-ID: <YA%2BCVDPKB3bVBjII@albert.catwhisker.org> In-Reply-To: <YA99eGXqOdxxOPv1@desktop> References: <YA99eGXqOdxxOPv1@desktop>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YA%2BCVDPKB3bVBjII>