svn commit: r368820 - head

Fri Dec 25 05:17:42 UTC 2020

Hartmann, O. o.hartmann at walstatt.org wrote on
Thu Dec 24 21:34:56 UTC 2020 :

> According to the status of the wiki refered to by https://wiki.freebsd.org/git,
>  most of
> the transition from svn to git has been done.
> According to the recent logs reported at 
> https://cgit.freebsd.org/src/,
>  the recent
> commits for "main" (I assume this is CURRENT?) are done 35 minutes ago, commit
> 322a188d45f17457f0de00a78c77228751dff03c.

"main" in git is is for what was CURRENT. git has its own use of
the text "HEAD" and so references to head require identification
of the context and possibly are best avoided. (I used to prefer
head to current, given head's use in svn.)

https://wiki.freebsd.org/git still lists "Finish git->svn exporter
for stable/11, stable/12, and supported releng/ branches" as
"In Q/A". The updates in svn should start again at some point.

12 and 11 via svn will still identify versions using text like
-r368999 and official builds will be based on such, if I
understand right. Official 13+ builds will not use such. If
one needs to match an official 12 or 11 build, using svn will
likely be easier to do that with.

If one can wait for the git -> svn delay before picking up
src changes in the ongoing future, continuing to use svn for
now may be easier.

It may (eventually) be better to use what official builds use.
But that still could mean svn for 12 and 11 until they are no
longer supported and only changing to git for 13+ (at some
point).

> The last message on this list is still this one I'm replying to.

FYI: there are (showing December threads style of access):

https://lists.freebsd.org/pipermail/freebsd-git/2020-December/thread.html

https://lists.freebsd.org/pipermail/dev-commits-src-main/2020-December/thread.html

They are probably better targets for your git related questions.

> I'm new to git, I usually do not switch between several code revisions systems, I assume
> a lot of FreeBSD users are familiar with subversion and share my problems of keeping
> pace. 
> 
> From the recent state of the list I assume its death.

svn is not dead for various versions of FreeBSD. It will not be
used for official 13+ builds, much like snapshots for 13 have not
been using svn (or its -rDDDDDDDD identifications) for some time
(despite svn for CURRENT being available for much of that time).

> 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.

If one is going to use git for 12 and/or 11, one clones the same
repository as for access to 13.

Context matters for checkouts. I tend to identify a specific commit
that I want to use, not just the most recent on a branch. (historically
true for svn -rDDDDDD usage as well). But one does not clone such a
specific git repository version. One gets a clone or updates a
repository and then causes git to extract the desire version from it
into the file system.

This is messier than just taking the most recent commit for whatever
branch of interest from whatever repository one uses (that is at least
recent enough to contain what is of interest). But i've no clue if
this is relevant to your usage patterns or not.

So you may have to describe you intended usage criteria for picking
what to check out. Otherwise the instructions may be misleading.

It is also important to know if you need source trees for multiple
branches at the same time vs. only one at a time. One at a time
leads to only needing one copy of the repository but multiple at
a time could be either with just one repository (multiple
worktree's) or one repository each. There are disk space tradeoffs
involved in such choices. So: more for you to provide some
usage criteria for in order for any help to well match your
intended context.

(git has means of context switching what is seen in the file system,
allowing switching branches in place. This is part of how "one at a
time" can be relevant: one switches the context in the file system
instead.)

> For /usr/doc it was easy to "clone" the repository and, who would doubt it, there were
> some hints how-to-do. But how do I checkout /usr/src for either CURRENT, 12.{1,2}-RELENG
> and 12-STABLE? Where is the primer for those "not-so-development-involved" people like
> me? And were to and how to report problems in themanner of this list regarding to certain
> commits?

There are various preliminary materials at:

https://github.com/bsdimp/freebsd-git-docs/

including:

https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md

and:

https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md

But I've also been doing other explorations to find what fits my usage
patterns or if there are patterns that I likely should change. I've
done some "non-production" fiddling separate from my still-existing
svn based context to get an idea what various things would end up
being like to use. (I've even done some diff -r compares between
some pre-existing svn contexts and analogous git ones that I tried
to make.)

I did catch that I have some "extra" files around that "svnlite diff"
output would not reference for how I've been working. (So such a
svnlite diff and a git apply of the diff output would not have covered
those extra files.) The files happened to be kernel configuration files.

Hopefully some of the above notes will prove of some use.

===
Mark Millard
marklmi at yahoo.com
( dsl-only.net went
away in early 2018-Mar)