I have a problem upgrading to drupal 4.7. beta 4.
Currently we are using 4.6.0. I tried upgrading directly to 4.7. and I tried by passing through 4.6.5. but both give me the same message when running update.php.
upgrade 4.6.0 to 4.6.5. + update.php works well but upgrade from 4.6.5. to 4.7. is not ok:

After running update.php I get following error message:

user warning: Duplicate column name 'severity' query: ALTER TABLE watchdog ADD severity tinyint(3) unsigned NOT NULL default '0' in /var/www/websites/knosos/drupalcopy/includes/database.mysql.inc on line 124.

http://drupal.org/node/40646 and
http://drupal.org/node/46850 talk on these sublects but they give not a clear solution

When I go to administer section I get following message:

user warning: Unknown column 'theme' in 'where clause' query: SELECT * FROM blocks WHERE theme = 'bluemarine' AND status = 1 ORDER BY region, weight, module in /var/www/websites/knosos/drupalcopy/includes/database.mysql.inc on line 124.

http://drupal.org/node/42554 and
http://drupal.org/node/42904 talk on these sublects but they give not a clear solution

I will try with version 4.7. beta 3 and with another theme but I am not sure this will give a solution...

Can somebody advise?

thx