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 | > wc -l` > > probably should remove the head from there, letting the rdiff run to > completion.
FWIW, I was able to merge after removing 'head'. Removing 'head' may have nothing to do with merge success, but what a relief! To speed things up, how about using the -s option with rdiff instead of the 'head' trick: > If you use the -s option, no patch output is produced. Instead, > a summary of the changed or added files between the two releases > is sent to the standard output device. This is useful for find- > ing out, for example, which files have changed between two dates > or revisions. Is it portable? Seems to be available on FreeBSD and Linux. Thanks a lot, Alex.