fre 2007-02-23 klockan 16:30 -0700 skrev Alex Rousskov:
> 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
These locks gets cleared automatically after a while and the lock is now
gone.
> 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 has two different kinds of locks.
* edit locks, set/unset manually. Inherited from RCS but generally isn't
used much in CVS or even meaningful in normal use of CVS.
* repository file locks, automatic while it updates the repository.
only the first category can be unlocked manually by using cvs admin. The
second is there to protect the structure of the repository.
Unfortunately sometimes when things go wrong a repository lock may be
left around..
Unfortunately CVS is a bit dumb and does not deal with stale repository
locks very well, but SourceForge automatically clears stale repository
locks after a while (some hours).
Regards
Henrik
This archive was generated by hypermail pre-2.1.9 : Thu Mar 01 2007 - 12:00:02 MST