Date: Wed, 30 May 2018 13:10:39 -0700 From: Xin LI <delphij@gmail.com> To: hselasky@freebsd.org Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> 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 Message-ID: <CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd%2B8H8vOKfrw@mail.gmail.com> In-Reply-To: <201805280812.w4S8CI56046943@repo.freebsd.org> References: <201805280812.w4S8CI56046943@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, May 28, 2018 at 1:14 AM Hans Petter Selasky <hselasky@freebsd.org> wrote: > Author: hselasky > Date: Mon May 28 08:12:18 2018 > New Revision: 334277 > URL: https://svnweb.freebsd.org/changeset/base/334277 > Log: > MFV r333789: libpcap 1.9.0 (pre-release) > MFC after: 1 month > Sponsored by: Mellanox Technologies > Replaced: > head/contrib/libpcap/ > - copied from r333789, vendor/libpcap/dist/ 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? (You should probably also update sys/net/bpf.h and/or sys/net/dlt.h, by the way).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd%2B8H8vOKfrw>