svn commit: r335091 - head/sbin/nvmecontrol

[John Baldwin]

On 6/13/18 10:21 PM, Warner Losh wrote:
> 
> 
> On Wed, Jun 13, 2018 at 10:57 PM, Rodney W. Grimes <freebsd at pdx.rh.cn85.dnsmgr.net <mailto:freebsd at 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