Date: Thu, 2 Apr 2020 13:50:30 -0500 From: Kyle Evans <kevans@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS%2By-q0%2BhTuG6-6N_MbQ@mail.gmail.com> In-Reply-To: <CANCZdfpgDt0=BeTg9m%2BD1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com> References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAJ9axoQOat%2BrgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com> <CANCZdfpgDt0=BeTg9m%2BD1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Apr 2, 2020 at 1:46 PM Warner Losh <imp@bsdimp.com> wrote: > > On Thu, Apr 2, 2020 at 1:25 AM Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wro= te: > > > Am Di., 10. M=C3=A4rz 2020 um 18:22 Uhr schrieb Warner Losh <imp@bsdimp= .com>: > > > > > > From my github freebsd mirror: > > > > > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > > > Author: kevans <kevans@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=3D/head/; revision=3D337810 > > > > > > 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=3Drevision&revision=3D337810 and n= ote > > 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS%2By-q0%2BhTuG6-6N_MbQ>