Date: Thu, 31 May 2018 09:41:27 +0200 From: Hans Petter Selasky <hps@selasky.org> To: Xin LI <delphij@gmail.com> 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: <22f8b1c6-a03c-4cf0-8ead-551cccdfea95@selasky.org> In-Reply-To: <CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd%2B8H8vOKfrw@mail.gmail.com> References: <201805280812.w4S8CI56046943@repo.freebsd.org> <CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd%2B8H8vOKfrw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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? 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. --HPS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?22f8b1c6-a03c-4cf0-8ead-551cccdfea95>