Date: Thu, 19 Feb 2004 10:53:29 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Nate Lawson <nate@root.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: <20040219085329.GB5351@ip.net.ua> In-Reply-To: <20040218113222.K36275@root.org> References: <200402170343.i1H3hCot079054@repoman.freebsd.org> <20040217165128.GB27143@tara.freenix.org> <20040218012226.GA16022@nagual.pp.ru> <20040218060253.GA42832@tara.freenix.org> <20040218110713.GG54588@FreeBSD.org.ua> <20040218094753.Q35672@root.org> <20040218184138.GA954@ip.net.ua> <20040218113222.K36275@root.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--QTprm0S8XgL7H0Dt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 18, 2004 at 11:37:00AM -0800, Nate Lawson wrote: > On Wed, 18 Feb 2004, Ruslan Ermilov wrote: > > On Wed, Feb 18, 2004 at 09:52:55AM -0800, Nate Lawson wrote: [...] > > > 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. >=20 > 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. >=20 > > 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. >=20 > I disagree with this. It IS different and not just in terms of future > imports. >=20 But we actually differ from vendor, since vendor still uses getopt.h, and we don't. > cvs diff will show that the old file which is no longer present > in HEAD is still around. >=20 Yes, but that's on purpose. I like it for contrib/groff/ to know that we have removed yacc(1) output files locally on HEAD, but still have them on the vendor branch (it's useful in particular to watch the differences in generated yacc(1) and lex(1) code). > If it's going in Xlist, it should be deleted > from the vendor branch. >=20 Yes, sure, the step #3 below takes care of that. > > 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". >=20 > This I also disagree with. It's unnecessary repo-thrashing to import and > then delete files immediately. >=20 You misunderstood me. What I meant is that if file getopt.h was previously imported on the FSF branch, and then we added it to FREEBSD-Xlist, but postpone its removal until the next import as I suggest, to keep the outputs from "cvs co -rFSF" and "cvs co -rv_x_y" consistent, then after next import we should remove it on FSF branch. After that, locally modified files (those on trunk), which are no longer needed should also be removed from HEAD. And this you seem to agree to. Cheers, --=20 Ruslan Ermilov FreeBSD committer ru@FreeBSD.org --QTprm0S8XgL7H0Dt Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFANHmJUkv4P6juNwoRAl6DAJ0apsfBFtAN/SrvNOeMesnHYDoKJACePiaZ NvJorb3ZeM3m6oJONe/9M7Q= =25ly -----END PGP SIGNATURE----- --QTprm0S8XgL7H0Dt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040219085329.GB5351>