Date: Wed, 8 Apr 2020 14:23:33 -0400 From: Ryan Stone <rysto32@gmail.com> To: Ed Maste <emaste@freebsd.org> Cc: Kyle Evans <kevans@freebsd.org>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH%2BVVy5f5OwQDvtn4Hteg@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
On Thu, Apr 2, 2020 at 3:35 PM Ed Maste <emaste@freebsd.org> wrote: > > 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 seem to recall a git converter bug fixed many years ago that would incorrectly record an MFC as a merge if and only if a new file was added to the destination branch, so I would not be surprised if you are correct about this.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH%2BVVy5f5OwQDvtn4Hteg>