Date: Fri, 10 Apr 2020 22:35:09 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: Ryan Stone <rysto32@gmail.com>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAJ9axoREPzDa3we%2BnwVFFq12v1u4Q6-b8Vq36OFBYOBL=aF92A@mail.gmail.com> In-Reply-To: <CAPyFy2CR9XbzxcGOuL8MnyrVBH_MPef-AdddcQXpjE0kJX1f1g@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> <CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH%2BVVy5f5OwQDvtn4Hteg@mail.gmail.com> <CAPyFy2CUHbiBN5STdGLgxqGafQTi3NUf5Mr_v-A_S75YOqKLuQ@mail.gmail.com> <CAFMmRNy5kBOZyiFeLDQi70-V1Vja2QJ3m_HyCemNmZBT9wr_eg@mail.gmail.com> <CAPyFy2C3z%2BGVp5LKgwpT1r5wNNr%2BQJQY76Aq-edDY8%2BjM0aHKg@mail.gmail.com> <CAFMmRNyFARV=sg_cH94np7uWazh4HzMeWA0hEnSkd2282ACX0w@mail.gmail.com> <CAPyFy2CR9XbzxcGOuL8MnyrVBH_MPef-AdddcQXpjE0kJX1f1g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am Do., 9. Apr. 2020 um 21:54 Uhr schrieb Ed Maste <emaste@freebsd.org>: > On Thu, 9 Apr 2020 at 15:39, Ryan Stone <rysto32@gmail.com> wrote: > > On reflection, I believe that what as happening was that the converter > > was using newly created files as a really bad heuristic for merges so > > that it would not have to try and understand mergeinfo. > > Ah, ok - so that's consistent with what I've inferred from looking at > a number of vendor updates. > > Yang (one of my co-op students) is currently working on a tool to > parse svn log / svn diff / svn propget svn:mergeinfo and emit a list > of merge-to/merge-from revisions. Cool stuff, if he can do it in Qt/C++, then we can pull that directly into the converter. I've frankensteined a variant, where the places with a mergeinfo change will at least dump an svn diff output (as I'm too stupid to understand the SVN/APR API nonsense). See https://github.com/freebsd/git_conv/commit/b6beacb522c503dba3da31b38feffa812517bc66 and followup commits. Cheers Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoREPzDa3we%2BnwVFFq12v1u4Q6-b8Vq36OFBYOBL=aF92A>