Strange commit

[Ulrich Spörlein]

Am Do., 9. Apr. 2020 um 21:54 Uhr schrieb Ed Maste <emaste at freebsd.org>:
> On Thu, 9 Apr 2020 at 15:39, Ryan Stone <rysto32 at 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