Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta <
zarychtam_at_plan-b.pwste.edu.pl> wrote:

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

There are no plans. $Id$, as implemented in git, records the wrong
information. Rather than a commit hash, it's the blob object hash which can
be hard to puzzle out. It would cause way more confusion were we to use it.
Plus, when I did experiments with it, it was slow and difficult to work
with. Given these issues, we've opted to not use it. Plus there's no
documented way to change $Id$ to $FreeBSD$ in an easy way, and the
filtering stuff looked extra fragile.


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

mergemaster and etcupdate can cope without them.

Warner