git commands for checking out 13-stable

[David Wolfskill]

On Tue, Jan 26, 2021 at 02:24:56AM +0000, tech-lists wrote:
> Hi,
> 
> 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,
> -- 
> J.

Further details at links from the above-cited Web page.

Peace,
david
-- 
David H. Wolfskill                              david at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-git/attachments/20210125/cf2a220a/attachment.sig>