Make sure you do your patches against the CVS tree. There have been
changes to several portions of ecommerce, and some of your corrections
may have been applied already.
As to the alter table drop column issue, I don't know of another
approach besides the awful mess path. Anyone know of a better way (tm)?