Date: Wed, 8 Apr 2020 12:05:53 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: Kyle Evans <kevans@freebsd.org>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAPyFy2AtH0yMTox9UXGoKUv4=_1r493sgJ_yzN%2BWDSzoybZxAg@mail.gmail.com> In-Reply-To: <CAJ9axoTy%2BKhpZ3yu-wnUj8ApG1SzCMDfQ3FFP-gtPcXDPcSsjA@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> <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS%2By-q0%2BhTuG6-6N_MbQ@mail.gmail.com> <CAPyFy2CyY7aVGa0DB4Lue16CrhrDs_o3QoXm8UMt0qajMX4pgQ@mail.gmail.com> <CAJ9axoTy%2BKhpZ3yu-wnUj8ApG1SzCMDfQ3FFP-gtPcXDPcSsjA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 6 Apr 2020 at 16:24, Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wrote: > > Can folks help out a bit on how merginfo is stored and whether it is > actually stored on the revisions? > > svn propget svn:mergeinfo -r337810 is not very useful output (and > doesn't say anything about /vendor/lua !) Ah, that's showing just the mergeinfo stored at the top of the tree. propget on the contrib dir shows the appropriate mergeinfo: ``` $ svn propget svn:mergeinfo -r337810 contrib/lua /vendor/lua/dist:326353-337809 ``` however this still isn't particularly useful for inferring the merge-from rev in a git revision because 337809 represents the repository revision at the time the merge was done, but we really care about the last revision in /vendor/lua/dist at the time of that merge. I think this is the appropriate merge-from revision: ``` $ svn log -l 1 ^/vendor/lua/dist@337809 ------------------------------------------------------------------------ r337586 | kevans | 2018-08-10 16:05:41 -0400 (Fri, 10 Aug 2018) | 2 lines Import lua 5.3.5 ```
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2AtH0yMTox9UXGoKUv4=_1r493sgJ_yzN%2BWDSzoybZxAg>