Thelma,
the error message you are getting is a strong indication that your code, or some of your code, is on cvs head rather than the 4.6 branch. Do you have any catalog xml files in your source tree? In that case you must be on cvs head. See my posts in this thread: