From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 10:28:02 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 3B9B016A4CE for ; Thu, 21 Oct 2004 10:28:02 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4276443D39 for ; Thu, 21 Oct 2004 10:28:01 +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 i9LAS0ZN071885; Thu, 21 Oct 2004 13:28:00 +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 44637-11; Thu, 21 Oct 2004 13:27:59 +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 i9LARrDI071882; Thu, 21 Oct 2004 13:27:56 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i9LARVpA047884; Thu, 21 Oct 2004 13:27:31 +0300 (EEST) (envelope-from ru) Date: Thu, 21 Oct 2004 13:27:30 +0300 From: Ruslan Ermilov To: Ian FREISLICH Message-ID: <20041021102730.GB47641@ip.net.ua> References: <20041021100440.GA69052@nagual.pp.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tsOsTdHNUZQcU9Ye" 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:28:02 -0000 --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--