From owner-svn-src-all@freebsd.org Thu Jun 14 17:12:36 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6F34101520F; Thu, 14 Jun 2018 17:12:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C41E7573E; Thu, 14 Jun 2018 17:12:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id A357C10AFAD; Thu, 14 Jun 2018 13:12:29 -0400 (EDT) Subject: Re: svn commit: r335091 - head/sbin/nvmecontrol To: Warner Losh , "Rodney W. Grimes" References: <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net> Cc: Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org From: John Baldwin Message-ID: <16d77299-ac4f-7885-674a-511d5f0f7b45@FreeBSD.org> Date: Thu, 14 Jun 2018 10:12:28 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Thu, 14 Jun 2018 13:12:30 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 17:12:36 -0000 On 6/13/18 10:21 PM, Warner Losh wrote: > > > On Wed, Jun 13, 2018 at 10:57 PM, Rodney W. Grimes > 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