freebsd stable - Dec 2020 - HEADS UP: FreeBSD src repo transitioning to git this weekend

Greetings,

The FreeBSD project will be moving it's source repo from subversion to git
starting this this weekend. The docs repo was moved 2 weeks ago. The ports
repo will move at the end of March, 2021 due to timing issues.

The short version is that we're switching the version control we're
using.
This switch will preserve much of the current FreeBSD development workflow.
After the switch, the subversion repo will become almost read-only. All
future work will be done in git, however as a transition aide we'll be
replaying the MFCs to stable/11, stable/12 and the related releng branches
for the life of those branches.

For more detailed information, please see
https://github.com/bsdimp/freebsd-git-docs/ for the current documentation.

Please see https://wiki.freebsd.org/git for the latest detailed schedule
(please note that this schedule is subject to change).

Warner

On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh
wrote:
> The FreeBSD project will be moving it's source repo from subversion to
git
> starting this this weekend. The docs repo was moved 2 weeks ago. The ports
> repo will move at the end of March, 2021 due to timing issues. ...
  I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when
clean),
but that's just a trivial issue with my source tree being marked -dirty
when it isn't, and that would have been part of r368709 anyway.  All my
other git nits have been my own (refs/notes and origin name).

W dniu 17.12.2020 o?01:46, Warner Losh pisze:
> Greetings,
> 
> The FreeBSD project will be moving it's source repo from subversion to
git
> starting this this weekend. The docs repo was moved 2 weeks ago. The ports
> repo will move at the end of March, 2021 due to timing issues.
> 
> The short version is that we're switching the version control we're
using.
> This switch will preserve much of the current FreeBSD development workflow.
> After the switch, the subversion repo will become almost read-only. All
> future work will be done in git, however as a transition aide we'll be
> replaying the MFCs to stable/11, stable/12 and the related releng branches
> for the life of those branches.
> 
> For more detailed information, please see
> https://github.com/bsdimp/freebsd-git-docs/ for the current documentation.
> 
> Please see https://wiki.freebsd.org/git for the latest detailed schedule
> (please note that this schedule is subject to change).
> 
> Warner
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at
freebsd.org"
> 
Will the project utilize gitatributes(5) to support ident as $Id:$ in
git repository?

In file header, we have now only $FreeBSD$ since svn tags disappeared
after the transition. Adding ident tags to certain files which are
updated by mergemaster(8) or etcupdated(8) would be appreciated.

Best regards,
-- 
Marek Zarychta

Hi,

Warner Losh <imp at bsdimp.com> wrote:
> The FreeBSD project will be moving it's source repo from subversion to
git
> starting this this weekend. 
First of all I'd like to thank all those involved in this for their efforts.

Following https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md
form your other mail I was able to migrate from svn to git without running into
any issues.

Right now I am learning how to use git the way I sed svn before. I am just
following 12-STABLE in order to build world and kernel. I am not developing,
neither am I committing.

I wonder how one would switch from a currently used branch (OLD) to another
branch (NEW).

With svn I used:
	svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src

For git I found:
	git branch -m stable/OLD stable/NEW
	or
	git branch -M stable/OLD stable/NEW

git-branch(1):
       With a -m or -M option, <oldbranch> will	be renamed to
<newbranch>. If
       <oldbranch> had a corresponding reflog, it is renamed to	match
       <newbranch>, and	a reflog entry is created to remember the branch
       renaming. If <newbranch>	exists,	-M must	be used	to force the
rename to
       happen.

I don't understand that text completely, because I don't know what a
reflog is, yet ;-)

Thus: Should I use "-m" or "-M" in my scenario when
switching from stable/12 to stable/13 in the near future?

Thanks and regards,
Michael

>?Greetings,
> The FreeBSD project will be moving it's source repo from subversion to
git
> starting this this weekend. The docs repo was moved 2 weeks ago. The ports
> repo will move at the end of March, 2021 due to timing issues.
> The short version is that we're switching the version control we're
using.
> This switch will preserve much of the current FreeBSD development workflow.
> After the switch, the subversion repo will become almost read-only. All
> future work will be done in git, however as a transition aide we'll be
> replaying the MFCs to stable/11, stable/12 and the related releng branches
> for the life of those branches.
> For more detailed information, please see
> https://github.com/bsdimp/freebsd-git-docs/ for the current documentation.
> Please see https://wiki.freebsd.org/git for the latest detailed schedule
> (please note that this schedule is subject to change).
Maybe my question is not directly linked with Git transition:
 earlier I can track commits to src tree via mailman list (svn-src-stable-12 for
example)
and select important commits to some parts of system or author of commit:
svn commit: r368642 - stable/12/sys/amd64/vmm/io   John Baldwin
Now in dev-commits-src-branches list (is there a separate list for stable-12
branch for
example?) I see hash and log message from commit:
git: d16dac42b641 - Apply upstream fix 08968baec1122a58bb90d8f97ad948a75f8a5d69:
Xin LI
May change in list commit message to system part of commit, as it be ealier?