Date: Wed, 11 Mar 2020 17:31:06 +0100 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAJ9axoQ8afmxpe1foY-4nU646wwYyA3M0gUXx2htGOcipvRF9A@mail.gmail.com> In-Reply-To: <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com> References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am Di., 10. M=C3=A4rz 2020 um 18:30 Uhr schrieb Ed Maste <emaste@freebsd.or= g>: > On Tue, 10 Mar 2020 at 13:22, Warner Losh <imp@bsdimp.com> wrote: > > > > 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 > > 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/1a0b3e0230e1b2430e5d8eb91ac99aeff5a= 1614d/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 ...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoQ8afmxpe1foY-4nU646wwYyA3M0gUXx2htGOcipvRF9A>