Date: Wed, 18 Feb 2004 11:37:00 -0800 (PST) From: Nate Lawson <nate@root.org> To: Ruslan Ermilov <ru@FreeBSD.org> Cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src/contrib/groff FREEBSD-Xlist src/contrib/groff/src/include getopt.h src/contrib/groff/src/libs/libgroff getopt.c getopt1.c Message-ID: <20040218113222.K36275@root.org> In-Reply-To: <20040218184138.GA954@ip.net.ua> References: <200402170343.i1H3hCot079054@repoman.freebsd.org> <20040218012226.GA16022@nagual.pp.ru> <20040218110713.GG54588@FreeBSD.org.ua> <20040218094753.Q35672@root.org> <20040218184138.GA954@ip.net.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 18 Feb 2004, Ruslan Ermilov wrote: > On Wed, Feb 18, 2004 at 09:52:55AM -0800, Nate Lawson wrote: > > On Wed, 18 Feb 2004, Ruslan Ermilov wrote: > > > On Wed, Feb 18, 2004 at 07:02:53AM +0100, Ollivier Robert wrote: > > > > According to Andrey Chernov: > > > > > > According to Andrey A. Chernov: > > > > > > > 1.3 +2 -0 src/contrib/groff/FREEBSD-Xlist > > > > > > > 1.2 +0 -169 src/contrib/groff/src/include/getopt.h (dead) > > > > > > > 1.2 +0 -1055 src/contrib/groff/src/libs/libgroff/getopt.c (dead) > > > > > > > 1.2 +0 -188 src/contrib/groff/src/libs/libgroff/getopt1.c (dead) > > > > > > > > > that it will be replacement for gnu getopt (as for fnmatch, stpcpy etc gnu > > > > > pollution). getopt_long() was too long in the libc to really trigger the > > > > > switch now. I don't take files off the branch, just remove unneded junk, > > > > > most of it is already in FREEBSD-Xlist. It always be our style to not > > > > > import unneeded files. > > > > > > > > Look at the commit message, these files were on the FSF vendor branch, you > > > > have taken these off that branch! That's _not_ the way you should have done > > > > it. > > > > > > Removing files on the HEAD branch is somewhat rather special way > > > to "take files off the vendor branch", and as Andrey already > > > pointed out, we needed to remove at least getopt.h so the > > > FreeBSD's native version of getopt.h gets used. And there was > > > no point keeping other getopt*.c either with this change. > > > > This is not the appropriate way to do it. des@, roberto@, and myself > > have all explained this both times this has happened. > > I know, I just happen to have a different opinion on this subject. > > Removing files on a vendor branch, OTOH, implies that these files > were removed by the vendor, which it's NOT. I consider the vendor branch to contain unmodified copies of files from the vendor distribution but not necessarily the entire distribution. There are numerous files (i.e. doc/*) which just don't belong in the tree. But I can see your point on this. > Of course one could argue that we should also put getopt.h > into FREEBSD-Xlist, so that the next import won't re-import > it again, but then it is not different from simply removing > it on HEAD -- there will be no conflict with future imports > using the same exclude file. I disagree with this. It IS different and not just in terms of future imports. cvs diff will show that the old file which is no longer present in HEAD is still around. If it's going in Xlist, it should be deleted from the vendor branch. > 3 (follows from #1) after a new import, both vendor branch > and HEAD, in that order, should be cleared to remove files > that were not imported (either vendor has removed them, or > these files are in our exclude list) with the commit log > such as "Removed files not present in the latest import". This I also disagree with. It's unnecessary repo-thrashing to import and then delete files immediately. -Nate
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040218113222.K36275>