From owner-cvs-src@FreeBSD.ORG Mon Apr 5 00:55:10 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E432A16A4CE; Mon, 5 Apr 2004 00:55:10 -0700 (PDT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id A00DA43D31; Mon, 5 Apr 2004 00:55:09 -0700 (PDT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i357wtON018961 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Apr 2004 10:58:57 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.12.11/8.12.11) id i357t00K033559; Mon, 5 Apr 2004 10:55:00 +0300 (EEST) (envelope-from ru) Date: Mon, 5 Apr 2004 10:55:00 +0300 From: Ruslan Ermilov To: Jacques Vidrine Message-ID: <20040405075459.GA33142@ip.net.ua> References: <200404032131.i33LVAvw074336@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi" Content-Disposition: inline In-Reply-To: <200404032131.i33LVAvw074336@repoman.freebsd.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: cvs-src@FreeBSD.org cc: src-committers@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 ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2004 07:55:11 -0000 --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 03, 2004 at 01:31:10PM -0800, Jacques Vidrine wrote: > nectar 2004/04/03 13:31:10 PST >=20 > FreeBSD src repository >=20 > Modified files: > crypto/heimdal/lib/hdb hdb_locl.h=20 > crypto/heimdal/lib/krb5 crypto.c=20 > Removed files: > crypto/heimdal TODO acinclude.m4=20 > crypto/heimdal/admin ktutil.cat8=20 > crypto/heimdal/appl/ftp/ftp ftp.cat1=20 > crypto/heimdal/appl/ftp/ftpd ftpd.cat8 ftpusers.cat5=20 > crypto/heimdal/appl/kf kf.cat1 kfd.cat8=20 > crypto/heimdal/appl/push pfrom.cat1 push.cat8=20 > crypto/heimdal/appl/telnet/telnet telnet.cat1=20 > crypto/heimdal/appl/telnet/telnetd telnetd.cat8=20 > crypto/heimdal/kadmin kadmin.cat8 kadmind.cat8=20 > crypto/heimdal/kdc hprop.cat8 hpropd.cat8 kdc.cat8=20 > kstash.cat8 string2key.cat8=20 > crypto/heimdal/kpasswd kpasswd.cat1 kpasswdd.cat8=20 > crypto/heimdal/kuser kdestroy.cat1 kgetcred.cat1 kinit.cat1=20 > klist.cat1=20 > crypto/heimdal/lib/kafs kafs.cat3=20 > crypto/heimdal/lib/roken config.h.in=20 > crypto/heimdal/tools krb5-config.cat1=20 > Log: > Resolve conflicts after import of Heimdal 0.6.1. > =20 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, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --Qxx1br4bt0+wmkIi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAcRDTUkv4P6juNwoRAhJVAJ9uF23PBTMItyhsEsmRjQSl2B1L7wCfSV6D 7X+I/cfX8vOurt9N2fWxEVg= =R21f -----END PGP SIGNATURE----- --Qxx1br4bt0+wmkIi--