I'm attempting to upgrade the codebase of one of our sites and ran into a problem after merging the code by means of cvs.
In 2002 I made the initial import of oacs 4.5b and I've now imported a new snapshot of OpenACS (openacs-5-0-compat) into the same project, following Andrew Piskorski's instructions under the headline "Upgrading Code - importing code that needs to be merged with existing code:".
The problem I'm facing is that some files that were present in the initial codebase (4.5b) and are no longer present in the newly imported codebase are still there in my updated working copy. At least one of these "linguering" files is causing a clean install to malfunction in the acs-lang department (the obsolete "lang-init.tcl" is sourced and causes the trouble, I think).
My question, then:
How do you get rid of old files which no longer exist in the later code, while at the same time retaining custom files which you added to your project in between the two imports? (Or don't you?)
/Ola
