From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 10:23:49 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 4FCA716A4CE for ; Thu, 21 Oct 2004 10:23:49 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E2FC43D41 for ; Thu, 21 Oct 2004 10:23:48 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i9LANj8k071759; Thu, 21 Oct 2004 13:23:45 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 44114-10; Thu, 21 Oct 2004 13:23:44 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i9LANck7071684; Thu, 21 Oct 2004 13:23:41 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i9LANGfI047859; Thu, 21 Oct 2004 13:23:16 +0300 (EEST) (envelope-from ru) Date: Thu, 21 Oct 2004 13:23:16 +0300 From: Ruslan Ermilov To: Ian FREISLICH Message-ID: <20041021102316.GA47641@ip.net.ua> References: <20041021093306.GA68546@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: Andrey Chernov cc: current@freebsd.org 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:23:49 -0000 --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 21, 2004 at 12:07:16PM +0200, Ian FREISLICH wrote: > Andrey Chernov wrote: > > On Thu, Oct 21, 2004 at 11:18:59AM +0200, Ian FREISLICH wrote: > > > > >From other side, maybe your copy of complete.c is not updated some= how: > > > > /*const*/ char *rl_completer_word_break_characters =3D (/*const*/ c= har=20 > > > > *)NULL; > > >=20 > > > It is not as you say. Maybe my local cvsup mirror (cvsup2.za.freebsd.= org) > > > is out of sync or their repo is broken. I know it's synced every > > > 2 hours (I used to work at the company that runs the mirror). My > > > repo was synced about an hour before I updated my source from it. > > >=20 > > > 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: > > >=20 > > > $FreeBSD: src/contrib/libreadline/complete.c,v 1.9 2003/08/31 18:29:3= 8 ache > E > > > xp $ > >=20 > > 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/libreadl= ine=20 > > contents? >=20 > Very interesting. 'cvs -q update -PdA' in /usr/src/: > M contrib/libreadline/complete.c >=20 > in /usr/src/contrib/libreadline/: > M contrib/libreadline/complete.c >=20 > In /usr/src/contrib: > RCS file: /home/ncvs/src/contrib/libreadline/complete.c,v > retrieving revision 1.9 > retrieving revision 1.1.1.9 > Merging differences between 1.9 and 1.1.1.9 into complete.c > rcsmerge: warning: conflicts during merge > cvs update: conflicts found in libreadline/complete.c > C libreadline/complete.c >=20 > Conflicts because of manual aplication of the difference you gave > me. Maybe my /usr/src is a schitzoid-whack-job and I must just > check it out again. >=20 > If I delete complete.c, and re-update there is no $Id$ tag in it > at all. >=20 Did you update your source tree after seeing the breakage, and what was the command? Was it also "cvs -update -APd"? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBd44UqRfpzJluFF4RAjBWAJ9CBzt4T+yIlhfoCEsTwc6+bUuGDQCgncv5 jjjkB04mMCxq0K0mWDFdx1c= =XgwB -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF--