[rancid] cvs status: conflict

Wagner Pereira

2011-02-02 20:13:28 UTC

"Excluded" means that I rm'ed the file, manually! Shame!

Everything is OK now. I removed the line from router.db, ran the Rancid,
inserted it back and re-ran the Rancid.

Thanks again.

Att,
--
Wagner Pereira

PoP-SP/RNP - Ponto de Presença da RNP em São Paulo
CCE/USP - Centro de Computação Eletrônica da Universidade de São Paulo
http://www.pop-sp.rnp.br
Tel. +55 11 3091-8901

Post by Wagner Pereira
Hi, folks.
I excluded, accidentally, one file named 10.0.0.4,v in the
/home/rancid/var/rancid/CVS/group/configs directory.

what do you mean 'excluded'? did you move the repository?
to fix,
rm configs/10.0.0.4
touch configs/10.0.0.4
cvs add configs/10.0.0.4
cvs commit -m '' configs/10.0.0.4
or remove it from router.db, run rancid, add it back.

Post by Wagner Pereira
I already ran the cvs update command, but the file was not recreated.
I thank John Heasley very much for all his valuable help.
---------------
starting: Qua Fev 2 17:19:24 BRST 2011
cvs status: conflict: `10.0.0.4' is modified but no longer in the repository
Trying to get all of the configs.
All routers sucessfully completed.
cvs diff: Diffing .
cvs diff: Diffing configs
cvs diff: cannot find revision control file for configs/10.0.0.4
cvs commit: Examining .
cvs commit: Examining configs
cvs commit: file `configs/10.0.0.4' had a conflict and has not been modified
cvs [commit aborted]: correct above errors first!
---------------
Att,
--
Wagner Pereira
PoP-SP/RNP - Ponto de Presen?a da RNP em S?o Paulo
CCE/USP - Centro de Computa??o Eletr?nica da Universidade de S?o Paulo
http://www.pop-sp.rnp.br
Tel. +55 11 3091-8901
_______________________________________________
Rancid-discuss mailing list
http://www.shrubbery.net/mailman/listinfo.cgi/rancid-discuss