Date: Thu, 29 Dec 2005 09:48:29 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Doug Barton <dougb@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/bind9/bin/dnssec dnssec-makekeyset.8 dnssec-makekeyset.c dnssec-makekeyset.docbook dnssec-makekeyset.html dnssec-signkey.8 dnssec-signkey.c dnssec-signkey.docbook dnssec-signkey.html src/contrib/bind9/doc/arm isc.color.gif nominum-docbook-html.dsl.in ... Message-ID: <20051229074829.GA54743@ip.net.ua> In-Reply-To: <200512290426.jBT4QDlg001028@repoman.freebsd.org> References: <200512290426.jBT4QDlg001028@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 29, 2005 at 04:26:13AM +0000, Doug Barton wrote: > dougb 2005-12-29 04:26:13 UTC >=20 > FreeBSD src repository >=20 > Removed files: > contrib/bind9/bin/dnssec dnssec-makekeyset.8=20 > dnssec-makekeyset.c=20 > dnssec-makekeyset.docbook=20 > dnssec-makekeyset.html=20 > dnssec-signkey.8 dnssec-signkey.c=20 > dnssec-signkey.docbook=20 > dnssec-signkey.html=20 [...] > Log: > Remove files no longer in the BIND 9 distribution > =20 Wrong. They should have been cvs-removed on the vendor branch. This would give the following benefits: 1) No conflicts. Now there are conflicts from the CVS's point of view: it now looks like we removed these files locally in FreeBSD while the vendor still has them. If any of the removed files will be added by the vendor later, then the next import will flag the conflict. 2) cvs checkout on the vendor branch (ISC) would produce the same contents as cvs checkout of the latest imported version (BIND_9_3_1). 3) Vendor-removed files would appear removed on the trunk (HEAD) checkout, except those locally modified. The main point of all of this is that it's the vendor who removed these files, not FreeBSD. We remove files on trunk (HEAD) when we don't need them locally but vendor still ships them and we still import them (example would be Windows-only files). P.S. There's no way to recover from the breakage except for taking these files out of the CVS backup, but it's still a good idea to also remove them on the vendor (ISC) branch. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --W/nzBZO5zC0uMSeA Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDs5TNqRfpzJluFF4RAkKeAJwPIyT6CLkOdwPzHxrUzrK2y8vm/QCfVe62 uJ+8RLI8sJMu1IsY92SYN4I= =YpEW -----END PGP SIGNATURE----- --W/nzBZO5zC0uMSeA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051229074829.GA54743>