[rancid] cvs status: conflict
wpereira at pop-sp.rnp.br
Wed Feb 2 20:13:28 UTC 2011
"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.
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
Tel. +55 11 3091-8901
fone at RNP: 10158902
Em 2/2/2011 18:02, john heasley escreveu:
> Wed, Feb 02, 2011 at 05:33:45PM -0200, 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.
>> I already ran the cvs update command, but the file was not recreated.
>> I thank John Heasley very much for all his valuable help.
>> That's the log's complete output:
>> 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!
>> 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
>> Tel. +55 11 3091-8901
>> fone at RNP: 10158902
>> Rancid-discuss mailing list
>> Rancid-discuss at shrubbery.net
More information about the Rancid-discuss