Re: locked out by partial cvsmerge

Henrik Nordstrom wrote:
> tis 2007-02-27 klockan 21:40 -0700 skrev Alex Rousskov:
>
>> Thanks for the explanation and snipped details. Unfortunately, it looks
>> like the problem is back and has even become worse as I see more locks
>> (from other developers) getting stuck now:
>>
>>> cvs rtag: [21:28:08] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
>>> cvs rtag: [21:28:38] waiting for serassio's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
>>> cvs rtag: [21:29:08] waiting for amosjeffries's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
>
> All seem to be gone now...
>
>> Do you know whether there is something going on with SourceForge that
>> increases the probability of these locks getting stuck? Anything we can
>> do about it in the short term?
>
> It might actually be the cvsmerge script.. the following line isn't
> exactly kind to CVS..
>
> o Check if there is any pending changes in the repository
> diffl=`eecvs -q rdiff -kk -r ${mergetag} -r ${mergefrom} ${module} | head | wc -l`
>
> probably should remove the head from there, letting the rdiff run to completion.

Is that a hint for us all to edit our copies of cvsmerge?

>
> Regards
> Henrik

Amos
Received on Wed Feb 28 2007 - 05:22:57 MST