SmartSVN - 来自多个分支的文件
我用 SmartSVN 打开了我的项目分支之一,但其中一个文件将其分支显示为“主干”,其余文件显示了正确的分支名称。我不确定这是怎么发生的,但想解决它。发生了什么事以及如何解决?
I have one of my project branches open with SmartSVN, but one of the files is showing its branch as "trunk" which the rest show the correct branch name. I'm not sure how this happened but would like to fix it. What happened and how can I fix it?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
事实上,这是 Subversion 的一个功能。是的,如果您的工作副本中需要此文件夹的特定分支,只需切换到它即可。它称为混合工作副本。唯一需要注意的是,所有路径都必须指向同一个存储库。现在,有趣的是,大多数人并不是故意使用此功能,而是以某种方式设法通过某种方式偶然发现它。
此功能的问题通常涉及到工作副本上的切换未完全切换,这通常是由于与 Subversion 服务器的终止连接、本地计算机上的资源不可用以及命令失败或超时,或者命令或应用程序在切换过程中被用户终止。
无论原因如何,解决此混合工作副本的最佳解决方案是转到工作副本的头部并执行另一个 svn 切换到您尝试使用的 URL。只需确保在进行操作之前以及关闭 SmartSVN 之前开关已完成即可。
Actaully, this is a feature of Subversion. Yep, want a particular branch for this folder in your working copy, just switch to it. It's called a mixed working copy. The only caveat for this to work, all paths have to be pointed to the same repository. Now, the fun part is, most people don't use this feature intentionally but somehow manage to stumble upon it through some way or another.
Stumbling on this feature usually involves a switch on a working copy that doesn't get fully switched, often in which is caused by a terminated connection to the Subversion server, resources unavailable on the local machine and the command fails or times out, or the command or application was terminated by the user in the middle of a switch.
No matter the cause, the best solution to resolve this mixed working copy, go to the head of working copy and do another svn switch to the URL you're trying to use. Just make sure the switch is complete before working on it and before you close SmartSVN.