Date: Wed, 3 Apr 2002 15:43:04 -0800 From: Murray Stokely <murray@FreeBSD.org> To: Andrea Campi <andrea@webcom.it> Cc: Murray Stokely <murray@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources Message-ID: <20020403234304.GN29594@freebsdmall.com> In-Reply-To: <20020403163209.GA14866@webcom.it> References: <200204010754.g317smi53702@freefall.freebsd.org> <20020403163209.GA14866@webcom.it>
next in thread | previous in thread | raw e-mail | index | archive | help
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 buildworlds since then, and I just moved aside my contrib/isc-dhcp and sbin/dhclient directories and checked them out again to make sure. Something is either wrong with your checkout, or I'm smoking crack and still have local changes in my tree. > ns_parse.c, which is off the vendor branch. Sorry I can't report the proper > error, but I can tell you I solved it with a simple: ns_parse.c is not off the vendor branch. It was off the vendor branch for a couple of days (over a month ago), before the CVS meisters added it back (with cvs admin) and we put the sed hack in place. The ISC accepted many of our patches, but the fix to ns_parse won't be available until the next release, so the sed hack is still necessary. You can do a diff of -r1.1.1.1 and -r1.1.1.2 of ns_parse.c to see what has changed. > cvs update -r1.1.1.2 ns_parse.c That is the correct new version of the file, from the vendor branch. If you check out dhclient from freefall, then you will get v1.1.1.2 of that file. Something appears to be wrong with your local setup. > Also, the sed trick we do on ns_parse.c is no longer needed. Yes it is (for now). Please let me know if everything works for you after a fresh checkout. - Murray 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?20020403234304.GN29594>