Discussion:
[rancid] RANCID CVS conflicts during update
Traiano Welcome
2009-09-10 12:40:18 UTC
Permalink
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:

--
***@stuff:~/routers_slow$ cvs update router.db
M router.db
---

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
john heasley
2009-09-10 22:03:31 UTC
Permalink
Post by Traiano Welcome
Hi List
When I add a router to the router.db and do a rancid-run, I get the
--
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.
--
M router.db
---
try just 'cvs update'. '^C' is the indicator of conflict files.
Post by Traiano Welcome
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
http://www.shrubbery.net/mailman/listinfo.cgi/rancid-discuss
Traiano Welcome
2009-09-11 09:01:32 UTC
Permalink
Hi John
Post by john heasley
Post by Traiano Welcome
Hi List
When I add a router to the router.db and do a rancid-run, I get the
--
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.
--
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
%
---
Post by john heasley
Post by Traiano Welcome
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
http://www.shrubbery.net/mailman/listinfo.cgi/rancid-discuss
Loading...