You read the title right; the trunk of GNU Classpath now contains the contents of what was the generics branch. You’ll now need ecj to compile, and we should really be supporting javac too (which should be compilable with current CVS, I hope)
Probably too early to say if there were any problems with the merge, but the actual transfer of code from generics to HEAD actually went very smoothly; a completely clean patch, and it built successfully at the first shot. What took time was getting generics back in sync, which always takes a while after a release, as the generics branch is in sync with the release branch rather than HEAD.
Please let me know ASAP about any regressions and such. CVS is back in business, so please start hammering the code and committing stuff again! As Mark says, please go nuts!