On Thu, 14 Mar 2019 at 22:05, Rodney W. Grimes <free...@gndrsh.dnsmgr.net> wrote: > > How do the tools today deal with taking a binary off the vendor branch? > Isn't this still a for-ever night mare merge thing to deal with?
There isn't really the concept of taking a file off the vendor branch in the same way as with CVS, although it's still prudent to limit changes to vendor/contrib files to avoid conflicts during future imports. Modifying binary contrib files is a different matter, but that would be difficult to deal with regardless of whether they're uuencoded or not. Anyway, I'm not aware of us having done that before. _______________________________________________ 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"