To merge changes you accidentally commited to HEAD into your branch:
merge via cvs update -j HEAD filename (on a 4.6 branch checkout)
To import just one package into a cvs repository I made a mirror of the openacs tree packages/pacakgename and imported from what would be the openacs root directory.