Date: Thu, 21 Oct 2004 13:27:30 +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: <20041021102730.GB47641@ip.net.ua> In-Reply-To: <E1CKZzM-000PSg-00@hetzner.co.za> References: <20041021100440.GA69052@nagual.pp.ru> <E1CKZzM-000PSg-00@hetzner.co.za>
next in thread | previous in thread | raw e-mail | index | archive | help
--tsOsTdHNUZQcU9Ye Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 21, 2004 at 12:16:08PM +0200, Ian FREISLICH wrote: > 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/librea= dline=20 > > > contents? > >=20 > > I just check by cvsupping from another machine, all looks right: > >=20 > > ... > > Edit src/contrib/libreadline/complete.c > > Add delta 1.1.1.9 2004.10.18.07.02.39 ache > > ... >=20 > 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. >=20 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 >=20 > 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)? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --tsOsTdHNUZQcU9Ye Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBd48SqRfpzJluFF4RAk/SAJ0fpdlR86fRHh20OuK8MfDek8WVcgCeLtLF zltQJxvqyH1fJQ6BIvrgPBk= =LdGD -----END PGP SIGNATURE----- --tsOsTdHNUZQcU9Ye--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041021102730.GB47641>