svn move 和本地更改
我需要执行 svn move 来重新排列我的存储库中的文件夹。如果我执行 svn move 而其他团队成员在其本地副本中有未提交的更改,会发生什么情况?他们会失去那些本地更改吗?
非常感谢
I need to do svn move to rearrange folders in my repo. What happen if I do the svn move while other team members have uncommited changes in their local copy? Will they lose those local changes?
Thank you very much
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
当他们提交时,他们将被迫先更新。然后他们会更新,会遇到冲突,并且必须手动解决。
When they commit, they will be forced to update first. Then they will update, will get a conflict, and will have to resolve it manually.
不,他们不会。但相信我,如果你不注意的话,这将是一场噩梦,Subversion 在这种情况下一点也不聪明。
如果可能的话,让他们提交所有更改,更新您的工作副本,只有这样您才能开始整理内容,而不会造成太多麻烦。
做任何其他事情,你就完蛋了。
我假设你没有分支,因为如果你这样做,下一次合并将会很痛苦。
No, they won't. But trust me, it will be a nightmare if you don't pay attention, Subversion's not at all smart in such situations.
If at all possible, make them commit every change, update your working copy and only then can you start shuffling stuff around without causing much grief.
Do anything else and you're screwed.
I'm assuming you don't have branches, because if you do, the next merge will be painful.