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 ...

[Ruslan Ermilov]

On Thu, Dec 29, 2005 at 04:26:13AM +0000, Doug Barton wrote:
> dougb       2005-12-29 04:26:13 UTC
> 
>   FreeBSD src repository
> 
>   Removed files:
>     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 
[...]
>   Log:
>   Remove files no longer in the BIND 9 distribution
>   
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,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20051229/055e54b6/attachment.bin