Date: Mon, 6 Apr 2020 22:24:36 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: Kyle Evans <kevans@freebsd.org>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAJ9axoTy%2BKhpZ3yu-wnUj8ApG1SzCMDfQ3FFP-gtPcXDPcSsjA@mail.gmail.com> In-Reply-To: <CAPyFy2CyY7aVGa0DB4Lue16CrhrDs_o3QoXm8UMt0qajMX4pgQ@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>
next in thread | previous in thread | raw e-mail | index | archive | help
Am Do., 2. Apr. 2020 um 21:35 Uhr schrieb Ed Maste <emaste@freebsd.org>: > On Thu, 2 Apr 2020 at 14:51, Kyle Evans <kevans@freebsd.org> wrote: > > 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. > > My working theory right now is that svn2git fails to detect merge > commits that only modify existing files and do not copy any new files. > I found a document[1] that svn2git should parse mergeinfo, but that's > in the context of a working / topic branch, not a vendor branch. That > document does point out that "grafts" can be used to retrofit the > history after the conversion, if we must. > > More investigation is needed. > > [1] https://web.archive.org/web/20190515003725/http://blog.agavi.org/post/16865375185/fixing-svn-merge-history-in-git-repositories Can folks help out a bit on how merginfo is stored and whether it is actually stored on the revisions? svn prophet svn:mergeinfo -r337810 is not very useful output (and doesn't say anything about /vendor/lua !) I haven't fully read through http://subversion.apache.org/docs//api/1.11/svn__mergeinfo_8h_source.html but it talks about mergeinfo being on paths (which is also my faint recollection) Cheers Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoTy%2BKhpZ3yu-wnUj8ApG1SzCMDfQ3FFP-gtPcXDPcSsjA>