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 > > > _at__at_ -1,4 +1,5 _at__at_ > > > 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
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:38:18 UTC