Date: Thu, 14 Jun 2018 10:12:28 -0700 From: John Baldwin <jhb@FreeBSD.org> To: Warner Losh <imp@bsdimp.com>, "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r335091 - head/sbin/nvmecontrol Message-ID: <16d77299-ac4f-7885-674a-511d5f0f7b45@FreeBSD.org> In-Reply-To: <CANCZdfrgHLqmR=Yyvcc_3vRXFLcAN7nJ8CKDrU29U77XZF1EqQ@mail.gmail.com> References: <CANCZdfrynxswb3d-oTwHJ0OGf2H8ibLwim7mg2iHavTXnDVPrg@mail.gmail.com> <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net> <CANCZdfrgHLqmR=Yyvcc_3vRXFLcAN7nJ8CKDrU29U77XZF1EqQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6/13/18 10:21 PM, Warner Losh wrote: > > > On Wed, Jun 13, 2018 at 10:57 PM, Rodney W. Grimes <freebsd@pdx.rh.cn85.dnsmgr.net <mailto:freebsd@pdx.rh.cn85.dnsmgr.net>> wrote: > > [ Charset UTF-8 unsupported, converting... ] > > Actually, that file (nvmecontrol_ext.h) is completely new. I'm not sure why > > it thought I copied it from util.c. Maybe it's a git svn integration thing. > > If it is a totally new file why is it showing contect diff with > + and -'s? > > > Don't know, but the whole contents of this file is 1 line of extern function statements. > > Since util.c is short, and I try to use identical copyright notices, I'm thinking git thought it was a move through 'magic' and that's where svn got confused into thinking it was a copy + modification which is where the diff came from. Yes. git fails at this often since it's notion of a copy is "implicit guess" that you can't override vs "explicit action". I sometimes have to do fixups after an 'arc patch' of a diff that git mangles where I save off a copy of the .c file, svn revert -f the file, then svn add the new file so it shows up as a new file from scratch. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?16d77299-ac4f-7885-674a-511d5f0f7b45>