From owner-freebsd-current@FreeBSD.ORG Thu Oct 21 10:57:54 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 7EEDD16A4CE; Thu, 21 Oct 2004 10:57:54 +0000 (GMT) Received: from hetzner.co.za (lfw.hetzner.co.za [196.7.18.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF4AF43D58; Thu, 21 Oct 2004 10:57:53 +0000 (GMT) (envelope-from ianf@hetzner.co.za) Received: from localhost ([127.0.0.1]) by hetzner.co.za with esmtp (Exim 3.36 #1) id 1CKadj-000PcM-00; Thu, 21 Oct 2004 12:57:51 +0200 To: Ruslan Ermilov From: Ian FREISLICH In-Reply-To: Message from Ruslan Ermilov of "Thu, 21 Oct 2004 13:27:30 +0300." <20041021102730.GB47641@ip.net.ua> Date: Thu, 21 Oct 2004 12:57:51 +0200 Sender: ianf@hetzner.co.za Message-Id: 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:57:54 -0000 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 Ian -- Ian Freislich