From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 19:01:19 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 746C616A4CE for ; Thu, 21 Oct 2004 19:01:19 +0000 (GMT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EB7243D5E for ; Thu, 21 Oct 2004 19:01:19 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.13.1/8.13.1) with ESMTP id i9LJ1HtT037833; Thu, 21 Oct 2004 12:01:17 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.13.1/8.13.1/Submit) id i9LJ1FFc037832; Thu, 21 Oct 2004 12:01:15 -0700 (PDT) (envelope-from obrien) Date: Thu, 21 Oct 2004 12:01:15 -0700 From: "David O'Brien" To: Andrey Chernov , Ian FREISLICH , freebsd-current@FreeBSD.ORG Message-ID: <20041021190115.GC37500@dragon.nuxi.com> References: <20041021085653.GA67949@nagual.pp.ru> <20041021093306.GA68546@nagual.pp.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041021093306.GA68546@nagual.pp.ru> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 6.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 Subject: Re: [PATCH] libreadline buildworld breakage. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.ORG List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 19:01:19 -0000 On Thu, Oct 21, 2004 at 01:33:07PM +0400, Andrey Chernov wrote: > On Thu, Oct 21, 2004 at 11:18:59AM +0200, Ian FREISLICH wrote: > > I don't think it's local repo corruption because I moved complete.c,v > > out of the way and re-supped. What version is your file? I have: > > > > $FreeBSD: src/contrib/libreadline/complete.c,v 1.9 2003/08/31 18:29:38 ache Exp $ > > It is old one. New one should be 1.1.1.9, without any $FreeBSD$ tag > Can you compare "cvs co contrib_libreadline" with your contrib/libreadline > contents? What are you talking about?? src/contrib/libreadline/complete is off the vendor branch. After you import a new version of libreadline you have to make a commit to HEAD to make the new version of src/contrib/libreadline/complete.c show up. Unless you commit *EXACTLY* rev 1.1.1.9 to HEAD (which would be rev 1.10) without any change; rev 1.10 should have a $FreeBSD$. -- -- David (obrien@FreeBSD.org)