Date: Thu, 2 Apr 2020 13:09:44 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAPyFy2AzSYZWUyNMe1KiC6BVprmzzxUu9XrBPpsS0oNtju1ZgA@mail.gmail.com> In-Reply-To: <CAJ9axoQOat%2BrgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com> References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAJ9axoQOat%2BrgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 2 Apr 2020 at 08:50, Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wrote: > > > svn path=3D/head/; revision=3D337810 > > > > 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 > https://svnweb.freebsd.org/base?view=3Drevision&revision=3D337810 and not= e > 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 https://github.com/freebsd/freebsd mirror: commit 5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5 Merge: b07b40d7feb6 6ae22f7302b6 Author: peter <peter@FreeBSD.org> 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 fix= es. In some cases I re-started from the vendor version and reimplemented ou= r 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 https://svnweb.freebsd.org/base?view=3Drevision&revision=3D180407 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?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2AzSYZWUyNMe1KiC6BVprmzzxUu9XrBPpsS0oNtju1ZgA>