From owner-cvs-all  Tue Feb  6  7:53:40 2001
Delivered-To: cvs-all@freebsd.org
Received: from mr14.vic-remote.bigpond.net.au (mr14.vic-remote.bigpond.net.au [24.192.1.29])
	by hub.freebsd.org (Postfix) with ESMTP
	id 32E1037B401; Tue,  6 Feb 2001 07:53:21 -0800 (PST)
Received: from CPE-61-9-164-106.vic.bigpond.net.au (CPE-61-9-164-239.vic.bigpond.net.au [61.9.164.239])
	by mr14.vic-remote.bigpond.net.au (Pro-8.9.3/8.9.3) with ESMTP id CAA02154;
	Wed, 7 Feb 2001 02:53:14 +1100 (EDT)
Received: (from root@localhost)
	by CPE-61-9-164-106.vic.bigpond.net.au (8.11.0/8.11.0) id f16FsRW22726;
	Wed, 7 Feb 2001 02:54:27 +1100 (EST)
From: Darren Reed <darrenr@reed.wattle.id.au>
Message-Id: <200102061553.CAA11777@avalon.reed.wattle.id.au>
Subject: Re: cvs commit: src/sys/netinet fil.c ip_auth.c ip_compat.h ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy
In-Reply-To: <20010206114234.C45171@wantadilla.lemis.com> from Greg Lehey at "Feb 6, 1 11:42:34 am"
To: grog@lemis.com (Greg Lehey)
Date: Wed, 7 Feb 2001 02:53:13 +1100 (EST)
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, asmodai@wxs.nl
X-Mailer: ELM [version 2.4ME+ PL37 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


Hmmm, I think I know what your problem is Greg.
The larger version jump changes are being committed with "commit"
rather than "import" due to conflicts from the import and file
changes being logged with the "fix conflicts" message rather than
for "import version x.y.x".

Darren


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