Re: locked out by partial cvsmerge

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 | 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?

Remove the head part of the pipe.. (`| head`, or `head |`)

but I still have it in my copy..

Regards
Henrik