From owner-cvs-all Thu Apr 4 7:19:30 2002 Delivered-To: cvs-all@freebsd.org Received: from hal-4.inet.it (hal-4.inet.it [213.92.5.23]) by hub.freebsd.org (Postfix) with ESMTP id 6FB8D37B423 for ; Thu, 4 Apr 2002 07:19:22 -0800 (PST) Received: (from root@localhost) by hal-4.inet.it (8.11.1/8.11.1) id g34FJLn238932 for ; Thu, 4 Apr 2002 17:19:21 +0200 Received: from acampi.inet.it(213.92.1.165) by hal-4.inet.it via I-SMTP-4.0.6-100 id s-213.92.1.165-YjqyUE; Thu Apr 4 17:19:21 2002 Received: from webcom.it (brian.inet.it [213.92.1.190]) by acampi.inet.it (Postfix) with SMTP id C560215536 for ; Thu, 4 Apr 2002 17:19:19 +0200 (CEST) Received: (qmail 43116 invoked by uid 1000); 4 Apr 2002 15:19:14 -0000 Date: Thu, 4 Apr 2002 17:19:13 +0200 From: Andrea Campi To: Murray Stokely Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources Message-ID: <20020404151913.GA43069@webcom.it> References: <200204010754.g317smi53702@freefall.freebsd.org> <20020403163209.GA14866@webcom.it> <20020403234304.GN29594@freebsdmall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020403234304.GN29594@freebsdmall.com> User-Agent: Mutt/1.3.27i X-Echelon: BND CIA NSA Mossad KGB MI6 IRA detonator nuclear assault strike 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 Wed, Apr 03, 2002 at 03:43:04PM -0800, Murray Stokely wrote: > On Wed, Apr 03, 2002 at 06:32:09PM +0200, Andrea Campi wrote: > > This commit broke world, as you probably forgot to resolve conflicts on > > No, I'm fairly certain that it did not. I've completed multiple Sorry for the noise, it was garbage in my local repo. I now understand why it happened and will make sure not to cry wolf again in the future. World is alive and well, at least for now... Bye, Andrea -- Loose bits sink chips. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message