From owner-cvs-all  Tue Jan 23 21:52:31 2001
Delivered-To: cvs-all@freebsd.org
Received: from citusc17.usc.edu (citusc17.usc.edu [128.125.38.177])
	by hub.freebsd.org (Postfix) with ESMTP
	id DD8FE37B400; Tue, 23 Jan 2001 21:52:10 -0800 (PST)
Received: (from kris@localhost)
	by citusc17.usc.edu (8.11.1/8.11.1) id f0O5te827595;
	Tue, 23 Jan 2001 21:55:40 -0800 (PST)
	(envelope-from kris)
Date: Tue, 23 Jan 2001 21:55:39 -0800
From: Kris Kennaway <kris@FreeBSD.org>
To: Archie Cobbs <archie@dellroad.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c
Message-ID: <20010123215539.A27564@citusc17.usc.edu>
References: <20010123200157.A25436@citusc17.usc.edu> <200101240533.VAA00299@curve.dellroad.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <200101240533.VAA00299@curve.dellroad.org>; from archie@dellroad.org on Tue, Jan 23, 2001 at 09:33:05PM -0800
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 23, 2001 at 09:33:05PM -0800, Archie Cobbs wrote:
> Kris Kennaway writes:
> > >   Modified files:
> > >     contrib/tcpdump      print-smb.c=20
> > >   Log:
> > >   Fix bug where tcpdump shows data beyond the end of certain NBT pack=
ets.
> > >  =20
> > >   Revision  Changes    Path
> > >   1.2       +3 -1      src/contrib/tcpdump/print-smb.c
> >=20
> > Congratulations, you just took this file off the vendor branch :-(
>=20
> Sorry if I'm being obtuse, but how is that a problem? Doesn't CVS
> do the right thing in this case? There are lots of other files
> in that directory with $FreeBSD$ in them.

No. From now on, every new vendor release of that file will need to
have patches merged by hand.

Kris

--=20
NOTE: To fetch an updated copy of my GPG key which has not expired,
finger kris@FreeBSD.org

--Dxnq1zWXvFF0Q93v
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: For info see http://www.gnupg.org

iD8DBQE6bm5bWry0BWjoQKURAjXHAKDuqo7IuN6cv9uIUI/VIMmebK5TCgCfT593
Zsd6Rw1P6sTsx1i/o9DqiU4=
=rDV4
-----END PGP SIGNATURE-----

--Dxnq1zWXvFF0Q93v--


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message