Date: Thu, 21 Oct 2004 13:23:16 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: Ian FREISLICH <if@hetzner.co.za> Cc: current@freebsd.org Subject: Re: [PATCH] libreadline buildworld breakage. Message-ID: <20041021102316.GA47641@ip.net.ua> In-Reply-To: <E1CKZqm-000PQb-00@hetzner.co.za> References: <20041021093306.GA68546@nagual.pp.ru> <E1CKZqm-000PQb-00@hetzner.co.za>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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 somehow: > > > > /*const*/ char *rl_completer_word_break_characters = (/*const*/ char > > > > *)NULL; > > > > > > 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. > > > > > > 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 > E > > > xp $ > > > > 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? > > Very interesting. 'cvs -q update -PdA' in /usr/src/: > M contrib/libreadline/complete.c > > in /usr/src/contrib/libreadline/: > M contrib/libreadline/complete.c > > 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 > > 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. > > If I delete complete.c, and re-update there is no $Id$ tag in it > at all. > Did you update your source tree after seeing the breakage, and what was the command? Was it also "cvs -update -APd"? Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBd44UqRfpzJluFF4RAjBWAJ9CBzt4T+yIlhfoCEsTwc6+bUuGDQCgncv5 jjjkB04mMCxq0K0mWDFdx1c= =XgwB -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041021102316.GA47641>