Strange commit

Ulrich Spörlein uqs at freebsd.org
Wed Mar 11 16:31:20 UTC 2020


Am Di., 10. März 2020 um 18:30 Uhr schrieb Ed Maste <emaste at freebsd.org>:

> On Tue, 10 Mar 2020 at 13:22, Warner Losh <imp at bsdimp.com> wrote:
> >
> > From my github freebsd mirror:
> >
> > commit 48babfba2e3da8bb5457300b288bbf22db3ff646
> > Author: kevans <kevans at FreeBSD.org>
> > Date:   Tue Aug 14 18:58:01 2018 +0000
> >
> >     MFV r337586: lua: Update to 5.3.5
> >
> >     Bugfix release, nothing too major.
> >
> >     Tested with:    lualoader via userboot, lualoader live
> >     Differential Revision:  https://reviews.freebsd.org/D16665
> >
> > Notes:
> >     svn path=/head/; revision=337810
>
> With a quick look it seems there are several cases - I tried
> git log --no-merges -i --grep 'update to'
>

This is intentional, please see
https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff5a1614d/src/svn.cpp#L883

Only projects and user branches are represented as merges to master, as
they usually have a full tree. This seemed to match the git model better
(as opposed to the SVN model).

Not sure whether we really want to handle these "code drops" as proper git
merge commits. I fear what that might do to the history ...


More information about the freebsd-git mailing list