[rancid] Re: RANCID CVS conflicts during update

[Traiano Welcome]

Hi John


john heasley wrote:
> Thu, Sep 10, 2009 at 02:40:18PM +0200, Traiano Welcome:
>   
>> Hi List
>>
>>  When I add a router to the router.db and do a rancid-run, I get the 
>> following errors in the logs:
>>
>> --
>> starting: Thu Sep 10 14:30:43 SAST 2009
>>
>> M router.db
>> There were CVS conflicts during update.
>>
>> M router.db
>>
>> ending: Thu Sep 10 14:30:43 SAST 2009
>> --
>>
>> I noticed the problem when I decided to remove the router from rancid.db 
>> and tried to add it  back a few minutes later. Now, if I leave it out, 
>> rancid does it's run properly for the other routers, but as soon as I 
>> try to add the router line back (I've checked the line syntax), it's 
>> breaks with the log message above.
>>
>> If I try to manually cvs update the router.db, I get:
>>
>> --
>> rancid at stuff:~/routers_slow$ cvs update router.db
>> M router.db
>> ---
>>     
>
> try just 'cvs update'.  '^C' is the indicator of conflict files.
>
>   

I get the following output, but it looks like I'm still getting the same 
log message in the most recent rancid-run:

--
% cvs update
cvs update: Updating .
M router.db
? routers.all
? routers.down
? routers.up
cvs update: Updating configs
%
---

>> Is it likely the CVS repository might be broken in some way? If so, is 
>> there a way to get it back into a consistent state?
>>
>> Thanks in Advance,
>> Traiano
>> _______________________________________________
>> Rancid-discuss mailing list
>> Rancid-discuss at shrubbery.net
>> http://www.shrubbery.net/mailman/listinfo.cgi/rancid-discuss
>>