locked out by partial cvsmerge

Hi there,

        I was running 'cvsmerge HEAD' from squid3-icap branch and got
distracted. Meanwhile the internet connection went down. I am not sure
where cvsmerge stopped, but it probably did not complete. If I try it
again, I get:

> cvs rtag: [06:10:02] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc

I tried to break my own lock, but, to my surprise, I get the same kind
of result from "cvs admin -u". It sounds like to break my lock, I need
to obtain it first, which does not make sense to me:

> cvs admin: [23:22:56] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc

FWIW, it is always the same directory that CVS gets stuck on.

Do we have command-line access to SourceForge CVS so that the lock file
can be manually removed? What should I do to unlock myself?

Thank you,

Alex.
Received on Fri Feb 23 2007 - 16:30:44 MST