Strange commit

Ed Maste emaste at
Thu Apr 2 17:10:22 UTC 2020

On Thu, 2 Apr 2020 at 08:50, Ulrich Spörlein <uqs at> wrote:
> >     svn path=/head/; revision=337810
> >
> > This should be a merge commit, but isn't. Can someone look into it?
> Hey Warner, this is not a merge commit in SVN either, see
> and note
> the lack of a "Copied from" message there.

Note that it does have mergeinfo added, indicating where it was merged from:

% svn diff -c 337810 | egrep -A4 '^Property changes on'
Property changes on: contrib/lua
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/lua/dist:r326353-337809

As far as I can tell the first commit after the switch to svn recorded
as a merge by svn2git is r180407. In the existing mirror:

commit 5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5
Merge: b07b40d7feb6 6ae22f7302b6
Author: peter <peter at>
Date:   Thu Jul 10 02:08:00 2008 +0000

    Merge gnu cpio 2.6 -> 2.8 changes.  Unfortunately, we have massive
    conflicts due to radically different approaches to security and bug fixes.
    In some cases I re-started from the vendor version and reimplemented our
    patches.  Fortunately, this is not enabled by default in -current.

It has this mergeinfo:

Property changes on: contrib/cpio
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/cpio/dist:r180400-180402
It includes a number of files that report "Copied from:"

Looking at the history in contrib/lua it looks like only the initial
import, r326353, is recorded as a merge in svn2git.

Is it possible that svn2git only detects a merge if new files are
added -- i.e., a SVN merge from vendor that only updates files but
does not add any new ones is missed?

More information about the freebsd-git mailing list