Date: Mon, 5 Apr 2004 10:55:00 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Jacques Vidrine <nectar@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: 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 ... Message-ID: <20040405075459.GA33142@ip.net.ua> In-Reply-To: <200404032131.i33LVAvw074336@repoman.freebsd.org> References: <200404032131.i33LVAvw074336@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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@FreeBSD.org FreeBSD committer [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAcRDTUkv4P6juNwoRAhJVAJ9uF23PBTMItyhsEsmRjQSl2B1L7wCfSV6D 7X+I/cfX8vOurt9N2fWxEVg= =R21f -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040405075459.GA33142>