不使用 SVN 时会发生什么？
我想知道当直接更新文件而不是使用 SVN 时 SVN 会发生什么？我问的主要原因是，当服务器（linux）有两个相同但大小写不同的名称时，在我的机器（windows）上更新 SVN 时出现问题。我在服务器上解决了这个问题，但没有通过 SVN 解决，因为它不会正确更新，但我仍然遇到问题。我需要运行某种命令来更新它吗？
谢谢。
编辑：
我删除了工作目录中的冲突文件，并想知道工作目录中的处理目录是否被跟踪，或者需要做什么才能重新同步。
I am wondering what happens in SVN when a file is updated directly instead of using SVN? The main reason I am asking is that there was a problem updating the SVN on my machine (windows) when the server (linux) had 2 names that were the same, but different case. I resolved this on the server, but didn't do it through SVN since it won't update correct, but I still get the issue. Do I need to run some kind of command to update it?
Thanks.
EDIT:
I deleted the comflicting file in the working direcotry and wanted to know if doing things directory in the working directory get tracked at all or what needs to be done to resync.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
当 SVN 由于存储库比本地签出更“最新”而被阻止时，一种愚蠢的万无一失的解决方案是：
请注意，如果您使用 tortoise 将文件移动到目录中，请确保将其移动到不与任何 SVN 项目关联的目录中。尝试撤消乌龟所做的有用更改并不有趣，因为您认为您需要 SVN 移动来伴随文件系统移动。
When SVN gets blocked because the repository is more "up to date" than the local checkout, one brain dead foolproof solution is:
Note that if you move the files into a directory using tortoise, make sure that you move it into a directory that's not associated with ANY SVN project. It's not fun trying to undo the helpful changes tortoise does in thinking your wanting a SVN move to accompany the file system move.
无需运行任何特殊命令。如果您更新了源代码，下次运行
svn updatesubversion 将无缝合并更改，您将获得最新的工作副本。如果您更改了某些文件，它们将显示为已修改或冲突，具体取决于您和其他用户所做的更改。
There is no need to run any special commands. If you updated the sources, the next time you will run
svn updatesubversion will seamlessly merge the changes and you will get an uptodate working copy.If you changed some files, they will appear modified or conflicted depending on the changes made by you and other users.