cvs commit: src/crypto/heimdal TODO acinclude.m4 src/crypto/heimdal/admin ktutil.cat8 src/crypto/heimdal/appl/ftp/ftp ftp.cat1 src/crypto/heimdal/appl/ftp/ftpd ftpd.cat8 ftpusers.cat5 src/crypto/heimdal/appl/kf kf.cat1 kfd.cat8 ...

[Ruslan Ermilov]

On Sat, Apr 03, 2004 at 01:31:10PM -0800, Jacques Vidrine wrote:
> nectar      2004/04/03 13:31:10 PST
> 
>   FreeBSD src repository
> 
>   Modified files:
>     crypto/heimdal/lib/hdb hdb_locl.h 
>     crypto/heimdal/lib/krb5 crypto.c 
>   Removed files:
>     crypto/heimdal       TODO acinclude.m4 
>     crypto/heimdal/admin ktutil.cat8 
>     crypto/heimdal/appl/ftp/ftp ftp.cat1 
>     crypto/heimdal/appl/ftp/ftpd ftpd.cat8 ftpusers.cat5 
>     crypto/heimdal/appl/kf kf.cat1 kfd.cat8 
>     crypto/heimdal/appl/push pfrom.cat1 push.cat8 
>     crypto/heimdal/appl/telnet/telnet telnet.cat1 
>     crypto/heimdal/appl/telnet/telnetd telnetd.cat8 
>     crypto/heimdal/kadmin kadmin.cat8 kadmind.cat8 
>     crypto/heimdal/kdc   hprop.cat8 hpropd.cat8 kdc.cat8 
>                          kstash.cat8 string2key.cat8 
>     crypto/heimdal/kpasswd kpasswd.cat1 kpasswdd.cat8 
>     crypto/heimdal/kuser kdestroy.cat1 kgetcred.cat1 kinit.cat1 
>                          klist.cat1 
>     crypto/heimdal/lib/kafs kafs.cat3 
>     crypto/heimdal/lib/roken config.h.in 
>     crypto/heimdal/tools krb5-config.cat1 
>   Log:
>   Resolve conflicts after import of Heimdal 0.6.1.
>   
Care to clean the vendor branch as well?  Since "cvs import" does not
delete files that are no longer supplied by a vendor, one should manually
"cvs rm -f" them, on the vendor branch.  The net effect is that

	cvs co -rKTH crypto/heimdal

should produce output identical to

	cvs co -rv_0_6_1 crypto/heimdal


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/20040405/544161a4/attachment.bin