deleted folder under svn control, replaced with folder of same name with different content, now svn wont work!

Question

I have recently upgraded one of our systems from Code Igniter 1.7.2 to 2.0.1.

Do do this you are required to replaced the system directory with a newer version.

The old CI system was under version control, including the system directory.

When I go to commit I get

So I go to execute the cleanup command and I get

How can I fix this?

Answer 1

If you just deleted the system folder (without svn remove to let subversion know) and replaced it with some other content, you could first bring back the last committed version of it and then replace or update the content with svn.

Example: Backup and remove the current system folder, do a svn update in "tada", "system" comes back. Now either svn remove it to svn add and commit the newer files or copy the new ones over it and commit the changes.

Answer 2

将新的系统目录备份到其他位置（在SVN工作副本之外），将工作副本还原为旧状态（如果需要，甚至执行新的签出操作），删除系统文件夹并提交，然后将备份的系统文件夹复制到工作副本，将其添加到SVN并再次提交。