Re: [PATCH] libreadline buildworld breakage.

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.

Ian

--
Ian Freislich