[PATCH] libreadline buildworld breakage.
Ruslan Ermilov
ru at freebsd.org
Thu Oct 21 06:26:06 PDT 2004
On Thu, Oct 21, 2004 at 12:57:51PM +0200, Ian FREISLICH wrote:
> Ruslan Ermilov wrote:
> >
> > > 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.
> > >
> > Yes, the repo-surgery was done some time ago, and it looks like you
> > were hit by it.
> >
> > > [brane-dead] /usr/src/contrib # diff -ud ~ianf/complete.c,v /home/ncvs/sr=
> > c/contrib/libreadline/complete.c,v=20
> > > --- /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.
> > >=20
> > This explains it. The surgery returned this file on a vendor branch,
> > adding this "branch 1.1.1;" line to an RCS file. Are you by chance
> > ALWAYS using the -s option to cvsup(1)?
>
> I never run cvsup with -s
>
> Root's crontab:
> #minute hour mday month wday
> #
> 0 0 * * * /usr/local/bin/cvsup /root/supfile-cvs
>
I don't know what's happening in your case. Here's what I did locally
with complete.c,v file:
1. Removed revision 1.1.1.9 (rcs -o1.1.1.9 complete.c,v)
2. Removed the "branch: 1.1.1" line from
I then ran cvsup (without -s), and here's what I get:
Updating collection cvs-all/cvs
Edit src/contrib/libreadline/complete.c,v
Set default branch to 1.1.1
Add delta 1.1.1.9 2004.10.18.07.02.39 ache
Can you please try it too, with the same CVSup mirror?
Cheers,
--
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20041021/e7d11049/attachment.bin
More information about the freebsd-current
mailing list