Date: Thu, 14 Mar 2019 22:39:13 -0400 From: Ed Maste <emaste@freebsd.org> To: "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r345138 - head/share/man/man9 Message-ID: <CAPyFy2D5cUcuUpTsCWr_65aXUvy8nxBTn-BphXF26tT%2B_JrFVg@mail.gmail.com> In-Reply-To: <201903150205.x2F25qtD027856@gndrsh.dnsmgr.net> References: <CANCZdfptd4Hg5NbAUnMmWHu7WNmarCo5RxqbD3uNzE4jJVkN0g@mail.gmail.com> <201903150205.x2F25qtD027856@gndrsh.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 14 Mar 2019 at 22:05, Rodney W. Grimes <freebsd@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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2D5cUcuUpTsCWr_65aXUvy8nxBTn-BphXF26tT%2B_JrFVg>