所以,在几次修订之前,我曾经有一个名为mysql的目录。我删除了它,并决定重新开始-但当我尝试创建新的mysql目录时-我总是遇到‘文件已经存在’错误:
support:/etc/puppet/modules# mkdir mysql
support:/etc/puppet/modules# svn add mysql/
A mysql
support:/etc/puppet/modules# svn commit -m " Test"
Adding modules/mysql
svn: Commit failed (details follow):
svn: File already exists: filesystem '/var/lib/svn/puppet/db', transaction '11-r', path '/trunk/modules/mysql'
support:/etc/puppet/modules# svn delete mysql
svn: Use --force to override this restriction
svn: 'mysql' has local modifications
support:/etc/puppet/modules# svn --force delete mysql
D mysql我看到其他一些帖子建议强制更新
support:/etc/puppet/modules# svn status
support:/etc/puppet/modules# svn update
At revision 11.
support:/etc/puppet/modules# svn mkdir mysql
A mysql
support:/etc/puppet/modules# svn commit -m "Test"
Adding modules/mysql
svn: Commit failed (details follow):
svn: File already exists: filesystem '/var/lib/svn/puppet/db', transaction '11-s', path '/trunk/modules/mysql'发布于 2014-01-17 16:49:46
我今天遇到了这个问题,Xcode在分支合并过程中崩溃了。不知何故,文件被上传到svn存储库,但是它没有正确地记录在svn数据库中。我在本地文件所在的目录中运行了以下命令:
svn revert bad.file
svn del svn://my.svnserver.com/svnDB/path/to/the/offending/file/bad.file然后,我从本地系统重新添加了该文件:
svn add bad.file
svn commit -m "Re adding bad.file"成功!
https://stackoverflow.com/questions/1407973
复制相似问题