From owner-cvs-all Sun Nov 26 12:34:14 2000 Delivered-To: cvs-all@freebsd.org Received: from falla.videotron.net (falla.videotron.net [205.151.222.106]) by hub.freebsd.org (Postfix) with ESMTP id 9C6F437B479; Sun, 26 Nov 2000 12:34:09 -0800 (PST) Received: from modemcable213.3-201-24.mtl.mc.videotron.ca ([24.201.3.213]) by falla.videotron.net (Sun Internet Mail Server sims.3.5.1999.12.14.10.29.p8) with ESMTP id <0G4N00E3CFSWKH@falla.videotron.net>; Sun, 26 Nov 2000 15:34:08 -0500 (EST) Date: Sun, 26 Nov 2000 15:34:40 -0500 (EST) From: Bosko Milekic Subject: Re: cvs commit: src/sys/netinet ip_dummynet.c In-reply-to: <200011262024.MAA62159@freefall.freebsd.org> To: Bosko Milekic Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Message-id: MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, 26 Nov 2000, Bosko Milekic wrote: > bmilekic 2000/11/26 12:24:19 PST > > Modified files: (Branch: RELENG_4) > sys/netinet ip_dummynet.c > Log: > MFC: bridging + ipfw + dummynet fixup... > (don't treat pseudo-mbuf 'pkt' as an mbuf, etc...) > > PR: kern/19551 ; misc/21534 ; kern/23010 > > Revision Changes Path > 1.24.2.5 +6 -6 src/sys/netinet/ip_dummynet.c This actually also touches src/sys/net/bridge.c I had to commit in two parts because of an error: cvs commit: in directory sys/netinet: cvs [commit aborted]: there is no version here; do 'cvs checkout' first (pardon me if I'm not getting that right, but I've followed the protocol -- this is the first time I'm getting this message)... The commit to net/bridge.c went in and I committed to netinet/ip_dummynet.c immediately after (which is what you're looking at). The original commit was supposed to touch both net/bridge.c and netinet/ip_dummyet.c but it failed the same way as above immediately after committing the net/bridge.c stuff. So I had to commit the second part (netinet/ip_dummynet.c) seperately right after. What's going on? Any ideas? (Note: the commit seems to have gone through, but I'd like to avoid this in the future - what am I doing wrong?) Bosko Milekic bmilekic@technokratis.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message