From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 13:26:06 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 E6AFD16A4CE for ; Thu, 21 Oct 2004 13:26:05 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1FAD43D39 for ; Thu, 21 Oct 2004 13:26:04 +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 i9LDQ3tl080771; Thu, 21 Oct 2004 16:26:03 +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 67812-18; Thu, 21 Oct 2004 16:26:02 +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 i9LDPuNT080761; Thu, 21 Oct 2004 16:25:59 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i9LDPYr1048657; Thu, 21 Oct 2004 16:25:34 +0300 (EEST) (envelope-from ru) Date: Thu, 21 Oct 2004 16:25:34 +0300 From: Ruslan Ermilov To: Ian FREISLICH Message-ID: <20041021132534.GE47641@ip.net.ua> References: <20041021102730.GB47641@ip.net.ua> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="T6xhMxlHU34Bk0ad" 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 13:26:06 -0000 --T6xhMxlHU34Bk0ad Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 21, 2004 at 12:57:51PM +0200, Ian FREISLICH wrote: > Ruslan Ermilov wrote: > >=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. > > > > > Yes, the repo-surgery was done some time ago, and it looks like you > > were hit by it. > >=20 > > > [brane-dead] /usr/src/contrib # diff -ud ~ianf/complete.c,v /home/ncv= s/sr=3D > > c/contrib/libreadline/complete.c,v=3D20 > > > --- /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:=3D > > 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. > > >=3D20 > > 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)? >=20 > I never run cvsup with -s >=20 > Root's crontab: > #minute hour mday month wday > # > 0 0 * * * /usr/local/bin/cvsup /root/supfil= e-cvs >=20 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, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --T6xhMxlHU34Bk0ad Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBd7jOqRfpzJluFF4RAsf+AJ0Q/Kku5OuVQMnhbi3chx9eZyud6ACdHVi9 SsGwVDb/qKx/oUIFT8q039g= =d42Z -----END PGP SIGNATURE----- --T6xhMxlHU34Bk0ad--