Strange commit

[Kyle Evans]

On Thu, Apr 2, 2020 at 1:46 PM Warner Losh <imp at bsdimp.com> wrote:
>
> On Thu, Apr 2, 2020 at 1:25 AM Ulrich Spörlein <uqs at freebsd.org> wrote:
>
> > Am Di., 10. März 2020 um 18:22 Uhr schrieb Warner Losh <imp at bsdimp.com>:
> > >
> > > 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
> > >
> > > This should be a merge commit, but isn't. Can someone look into it?
> > >
> >
> > Hey Warner, this is not a merge commit in SVN either, see
> > https://svnweb.freebsd.org/base?view=revision&revision=337810 and note
> > the lack of a "Copied from" message there.
> >
>
> Yikes! OK. Kyle had sworn up and down that he did a merge commit...
>

I'm not sure I understand what's going on here... it's a merge commit
that didn't have any new files or moved files. This is the exact
result you get from svn merge -c from the vendor/ branch with just
file modifications -- note the svn:mergeinfo.