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

[John Baldwin]

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