Strange commit

Ryan Stone rysto32 at gmail.com
Wed Apr 8 18:23:47 UTC 2020


On Thu, Apr 2, 2020 at 3:35 PM Ed Maste <emaste at freebsd.org> wrote:
>
> On Thu, 2 Apr 2020 at 14:51, Kyle Evans <kevans at 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.


More information about the freebsd-git mailing list