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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
