From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 10:16:18 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 1BC2416A4CE for ; Thu, 21 Oct 2004 10:16:18 +0000 (GMT) Received: from hetzner.co.za (lfw.hetzner.co.za [196.7.18.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73EB743D58 for ; Thu, 21 Oct 2004 10:16:17 +0000 (GMT) (envelope-from ianf@hetzner.co.za) Received: from localhost ([127.0.0.1]) by hetzner.co.za with esmtp (Exim 3.36 #1) id 1CKZzM-000PSg-00; Thu, 21 Oct 2004 12:16:08 +0200 To: Andrey Chernov , current@FreeBSD.ORG From: Ian FREISLICH In-Reply-To: Message from Andrey Chernov <20041021100440.GA69052@nagual.pp.ru> Date: Thu, 21 Oct 2004 12:16:08 +0200 Sender: ianf@hetzner.co.za Message-Id: Subject: Re: [PATCH] libreadline buildworld breakage. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list 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 10:16:18 -0000 Andrey Chernov wrote: > On Thu, Oct 21, 2004 at 01:33:07PM +0400, Andrey Chernov wrote: > > 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? > > I just check by cvsupping from another machine, all looks right: > > ... > Edit src/contrib/libreadline/complete.c > Add delta 1.1.1.9 2004.10.18.07.02.39 ache > ... I was going to ask in the other mail if some repo surgery had taken place. The last time this happened to me, someone had perpetrated a repo surgury and something about when I and the mirror synced broke things in a way that screwed me (and I think one or two others) over. [brane-dead] /usr/src/contrib # diff -ud ~ianf/complete.c,v /home/ncvs/src/contrib/libreadline/complete.c,v --- /home/ianf/complete.c,v Mon Oct 18 09:02:43 2004 +++ /home/ncvs/src/contrib/libreadline/complete.c,v Mon Oct 18 09:02:43 2004 @@ -1,4 +1,5 @@ head 1.9; +branch 1.1.1; access; symbols v5_0:1.1.1.9 This is the diff of the ,v file. The one in ~ianf was moved out of CVSROOT after a cvsup that changed nothing. An immediate subsequent cvsup produced a ,v file with this difference. Ian -- Ian Freislich