From owner-cvs-all Sat Dec 14 17:13:27 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B889837B401; Sat, 14 Dec 2002 17:13:26 -0800 (PST) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3624343EC5; Sat, 14 Dec 2002 17:13:26 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.6/8.12.2) with ESMTP id gBF1DMN6003357; Sat, 14 Dec 2002 17:13:22 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.6/8.12.6/Submit) id gBF1C6ho003333; Sat, 14 Dec 2002 17:12:06 -0800 (PST) Date: Sat, 14 Dec 2002 17:12:06 -0800 From: "David O'Brien" To: Giorgos Keramidas Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/lukemftpd/src ftpd.conf.5 ftpusers.5 Message-ID: <20021215011206.GA3215@dragon.nuxi.com> Reply-To: obrien@freebsd.org Mail-Followup-To: David O'Brien , Giorgos Keramidas , cvs-committers@freebsd.org, cvs-all@freebsd.org References: <200212142345.gBENjsXt013471@repoman.freebsd.org> <20021215000810.GA4894@gothmog.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021215000810.GA4894@gothmog.gr> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 15, 2002 at 02:08:10AM +0200, Giorgos Keramidas wrote: > On 2002-12-14 15:45, Giorgos Keramidas wrote: > > > > Revision Changes Path > > 1.2 +53 -10 src/contrib/lukemftpd/src/ftpd.conf.5 > > ARGH! I don't know why my remote update messed things up, but this > commit included the changes from 1.1.1.1 -> 1.1.1.2 and I really can't > figure out why. You've just been bitten by what happens when one pulls a file off the vendor branch -- a huge delta happens, even for only 3 lines of change. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message