CVS problems with merging directories.

In order to add my regressiontest.pl into the mainline I want to merge the tests directory from the sjt-xft branch so that the tests/autoconf directory will be brought in. When I run the update I get the following error: --------------------------------------------------------------------------- silver: malcolmp$ cvs-rw -n update -jsjt-xft -d . cvs server: Updating . RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v retrieving revision 1.62 retrieving revision 1.62.2.2 Merging differences between 1.62 and 1.62.2.2 into ChangeLog cvs server: ChangeLog: No such file or directory --------------------------------------------------------------------------- What's the correct way of getting tests/autoconf into the main branch? Malcolm -- Malcolm Purvis <malcolmp(a)xemacs.org&gt;