Date: Tue, 23 Jan 2001 22:10:49 -0800 (PST) From: Archie Cobbs <archie@dellroad.org> To: Kris Kennaway <kris@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Message-ID: <200101240610.WAA00480@curve.dellroad.org> In-Reply-To: <20010123215539.A27564@citusc17.usc.edu> "from Kris Kennaway at Jan 23, 2001 09:55:39 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101240610.WAA00480>