From owner-cvs-all  Tue Jan 23 22:11:14 2001
Delivered-To: cvs-all@freebsd.org
Received: from InterJet.dellroad.org (adsl-63-194-81-26.dsl.snfc21.pacbell.net [63.194.81.26])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3AFF837B400; Tue, 23 Jan 2001 22:10:50 -0800 (PST)
Received: from curve.dellroad.org (curve.dellroad.org [10.1.1.30])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id WAA48371;
	Tue, 23 Jan 2001 22:10:49 -0800 (PST)
Received: (from archie@localhost)
	by curve.dellroad.org (8.9.3/8.9.3) id WAA00480;
	Tue, 23 Jan 2001 22:10:49 -0800 (PST)
	(envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200101240610.WAA00480@curve.dellroad.org>
Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c
In-Reply-To: <20010123215539.A27564@citusc17.usc.edu> "from Kris Kennaway at
 Jan 23, 2001 09:55:39 pm"
To: Kris Kennaway <kris@FreeBSD.org>
Date: Tue, 23 Jan 2001 22:10:49 -0800 (PST)
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL77 (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Kris Kennaway writes:
> > > >   Modified files:
> > > >     contrib/tcpdump      print-smb.c 
> > > >   Log:
> > > >   Fix bug where tcpdump shows data beyond the end of certain NBT packets.
> > > >   
> > > >   Revision  Changes    Path
> > > >   1.2       +3 -1      src/contrib/tcpdump/print-smb.c
> > > 
> > > Congratulations, you just took this file off the vendor branch :-(
> > 
> > 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.

By hand? The "cvs update -j .. -j .." or whatever that you do after
an import should take care of all of the non-conflicting modifications
for all of the files at once.  So there should be zero extra work
caused by this change, unless I'm misunderstanding something (I'm
not a CVS expert).

-Archie

___________________________________________________________________________
Archie Cobbs   *   Whistle Communications, Inc.  *   http://www.whistle.com


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