Auth: yes  Time: Tue Apr 25 14:29:41 2000 Host: DCL.MIT.EDU
From: Ken Raeburn <raeburn>

I'd try:
update mainline to latest
tag mainline
check in changes
tag mainline
cvs upd -rbranch 
cvs upd -jmainline-before-tag -jmainline-after-tag