SVN:文件夹已在版本控制下但未提交? [英] SVN: Folder already under version control but not comitting?

问题描述

mark@mark-ubuntu:~/myproject$ svn stat
?       runserver.sh
?       media/images/icons
?       apps/autocomplete
mark@mark-ubuntu:~/myproject$ svn add apps/autocomplete
svn: warning: 'apps/autocomplete' is already under version control

svn stat 说它不受版本控制，所以我尝试添加它，然后它告诉我它是.当我执行 svn ci 时，它不会被提交，并且当我尝试在线浏览存储库时也不会显示.

svn stat says its not under version control, so I try to add it, and then it tells me it is. When I do an svn ci, it doesn't get comitted, and doesn't show up when I try to browse to repository online.

我如何让它提交?

推荐答案

将有问题的文件夹复制到某个备份目录中，并将其从 SVN 工作目录中删除.记得从复制的文件夹中删除所有 .svn 隐藏目录.

Copy problematic folder into some backup directory and remove it from your SVN working directory. Remember to delete all .svn hidden directories from the copied folder.

现在更新您的项目，清理并提交剩下的内容.现在将您的文件夹移回工作目录，添加它并提交.大多数情况下，这种解决方法有效，似乎基本上 SVN 被混淆了...

Now update your project, clean-up and commit what has left. Now move your folder back to working directory, add it and commit. Most of the time this workaround works, it seems that basically SVN got confused...

更新:引用 @Mark 的评论:

Update: quoting comment by @Mark:

不需要移动文件夹，只需删除 .svn 文件夹，然后 svn-adding 就可以了.

Didn't need to move the folder around, just deleting the .svn folder and then svn-adding it worked.

这篇关于SVN:文件夹已在版本控制下但未提交?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！