Upgrade from 6.14 (downloaded) to 6.14 (using CVS) fails

I have a site running on Drupal 6.14 successfully. I tried moving it to a CVS checkout of 6.14, and I get the following error when I run update.php:

An error occurred. http:///update.php?id=25&op=do
Fatal error: Call to undefined function content_field_tablename() in /home/.kicked/jeliasen/drupal-6.14/sites/all/modules/cck/modules/userreference/userreference.install on line 127

On the next page, I get this: The update process was aborted prematurely while running update #6002 in userreference.module. All errors have been logged.

When I go to the administration pages, I see this:
* warning: array_map() [function.array-map]: Argument #2 should be an array in /home/.kicked/jeliasen/drupal-6.14/modules/system/system.module on line 1015.
* warning: array_keys() [function.array-keys]: The first argument should be an array in /home/.kicked/jeliasen/drupal-6.14/includes/theme.inc on line 1771.
* warning: Invalid argument supplied for foreach() in /home/.kicked/jeliasen/drupal-6.14/includes/theme.inc on line 1771.

Here's the status report:
Drupal 6.14
Access to update.php Protected
Configuration file Protected
Cron maintenance tasks Last run 33 min 15 sec ago
You can run cron manually.
Database updates Up to date
Drupal core update status No update data available
No information is available about potential new releases for currently installed modules and themes. To check for updates, you may need to run cron or you can check manually. Please note that checking for available updates can take a long time, so please be patient.
File system Writable (public download method)
GD library bundled (2.0.34 compatible)
MySQL database 5.0.67
PHP 5.2.6
PHP memory limit 90M
PHP register globals Disabled
Unicode library PHP Mbstring Extension
Update notifications Enabled
Web server Apache

I'm not sure where to find the logs for the update, but I'm happy to post them if they help. I'm not really sure what to do next. Help?

Thanks!

jeff