On Wednesday 24 September 2003 16:56, Stephen McConnell wrote: > Umm, am I sufficiently brave ... ? > What about just nuking the contents of avalon-site/site/framework and > doing a clean import?
add + commit is safer than anything else. It can be rolled back very easily. Not sure what you mean by "nuking", but sounds a lot more "serious". If you mean remove stuff in CVS server directories, I would recommend against it since you loose all history. > My experience in the past is that I can (without problem) import over > prior imports, but I cannot import over commits. Not sure what you mean. The problem for "import" is that "merging" of changes happens on client, and not on the server (you notice this when you try to commit a file someone else have changed since you last updated it), and import is not constructed to handle "merges", so if the files are the same = no problem, but if they are different, it just says that there is "file in the way". Or a another funny way of doing it is to create a branch on the existing site, then modify that to your liking and then merge the branch back to the head. But that does not really add much value from a remove/add/commit manouver I told you about... Maybe you just commit the stuff in where they are located now, and ask Leo Simons to do the transfer for you ;o) Niclas --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
