From owner-svn-src-all@freebsd.org Thu Jun 7 14:16:12 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 18994FF04ED; Thu, 7 Jun 2018 14:16:12 +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 B97076B652; Thu, 7 Jun 2018 14:16:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (unknown [137.122.64.159]) by mail.baldwin.cx (Postfix) with ESMTPSA id 14F4310B429; Thu, 7 Jun 2018 10:16:10 -0400 (EDT) Subject: Re: svn commit: r334277 - in head: contrib/libpcap contrib/ofed/usr.lib/3 contrib/pf/pflogd contrib/wpa/src/l2_packet lib lib/libpcap share/mk usr.sbin/cxgbetool To: Hans Petter Selasky , Xin LI References: <201805280812.w4S8CI56046943@repo.freebsd.org> <22f8b1c6-a03c-4cf0-8ead-551cccdfea95@selasky.org> Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: John Baldwin Message-ID: <3bbe9239-fa04-7f4c-d52c-a0347ef12650@FreeBSD.org> Date: Thu, 7 Jun 2018 10:16:10 -0400 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: <22f8b1c6-a03c-4cf0-8ead-551cccdfea95@selasky.org> 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, 07 Jun 2018 10:16:11 -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, 07 Jun 2018 14:16:12 -0000 On 5/31/18 3:41 AM, Hans Petter Selasky wrote: > On 05/30/18 22:10, Xin LI wrote: >> This would make vendor/libpcap/dist history replace head/contrib/libpcap, >> which effectively discards all FreeBSD local changes for base purposes, and >> hides its change history. Is this intentional? If not, could you please >> revert the tree back to its previous state and redo the merge? >> > > Hi, > >> (You should probably also update sys/net/bpf.h and/or sys/net/dlt.h, by the >> way). > > It is a vendor library, we should try to avoid local changes? No, that's not realistic. > The problem is that some files are deleted upstream and I'm not sure if > "merge" will track that when we don't merge from the same branch. svn understands deletions when merging. You need to revert and fix this properly. Doing a real merge would also have meant that you would probably not have caused the ports breakage since svn merge would have flagged the existing local changes you silently overwrote/dropped. -- John Baldwin