Re: locked out by partial cvsmerge

2007-02-28 Thread Alex Rousskov
On Wed, 2007-02-28 at 10:35 +0100, Henrik Nordstrom wrote: > 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 | > w

Re: locked out by partial cvsmerge

2007-02-28 Thread Henrik Nordstrom
tor 2007-03-01 klockan 01:25 +1300 skrev Amos Jeffries: > > 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

Re: locked out by partial cvsmerge

2007-02-28 Thread Amos Jeffries
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] waitin

Re: locked out by partial cvsmerge

2007-02-28 Thread Henrik Nordstrom
ons 2007-02-28 klockan 18:16 +1300 skrev [EMAIL PROTECTED]: > Or we could call a 48+ hour holiday for any usage of HEAD and see if the > locks disappear. Mine was either created 18 hours ago now or 36. > > For my part I'm going to stop-work until this gets fixed or someone else > can run a full c

Re: locked out by partial cvsmerge

2007-02-28 Thread Henrik Nordstrom
ons 2007-02-28 klockan 13:01 +0800 skrev Adrian Chadd: > I'm not sure to be honest; but do you think it'd be a good idea just to shift > this > development tree stuff back to a seperate repository or server over at TMF? > It sounds like it'll be less of a headache now. The main reason why SF is

Re: locked out by partial cvsmerge

2007-02-28 Thread Henrik Nordstrom
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

Re: locked out by partial cvsmerge

2007-02-27 Thread squid3
> On Tue, Feb 27, 2007, Alex Rousskov wrote: >> On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: >> >> > These locks gets cleared automatically after a while and the lock is >> now >> > gone. >> >> Thanks for the explanation and snipped details. Unfortunately, it looks >> like the problem

Re: locked out by partial cvsmerge

2007-02-27 Thread Adrian Chadd
On Tue, Feb 27, 2007, Alex Rousskov wrote: > On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: > > > These locks gets cleared automatically after a while and the lock is now > > gone. > > Thanks for the explanation and snipped details. Unfortunately, it looks > like the problem is back a

Re: locked out by partial cvsmerge

2007-02-27 Thread Alex Rousskov
On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: > These locks gets cleared automatically after a while and the lock is now > gone. 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

Re: locked out by partial cvsmerge

2007-02-23 Thread Henrik Nordstrom
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 ge

Re: locked out by partial cvsmerge

2007-02-23 Thread Alex Rousskov
On Sat, 2007-02-24 at 15:33 +1300, Amos Jeffries wrote: > Adrian Chadd wrote: > > On Fri, Feb 23, 2007, Alex Rousskov wrote: > > > >> 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? > > > > Shell.sourceforge.

Re: locked out by partial cvsmerge

2007-02-23 Thread Amos Jeffries
Adrian Chadd wrote: On Fri, Feb 23, 2007, Alex Rousskov wrote: 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? Shell.sourceforge.net is currently busted for some reason. I wonder whats going on. oh, grrr. I

Re: locked out by partial cvsmerge

2007-02-23 Thread Adrian Chadd
On Fri, Feb 23, 2007, Alex Rousskov wrote: > 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? Shell.sourceforge.net is currently busted for some reason. I wonder whats going on. adrian

locked out by partial cvsmerge

2007-02-23 Thread 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 > /cvsr