SVN X 仍然处于树冲突中
我正在使用 VisualSVN(它使用 Tortoise)。我不小心将文件夹移动到其他位置。当尝试将其移回时,SVN 会出现此错误。它以前发生过一次,我设法做了一些随机更新/提交,不知道我在做什么,它被“修复”了。我无法再次发挥同样的魔力,所以我需要知道如何获取我的文件和目录以及树冲突。
谢谢!
I am using VisualSVN (which uses Tortoise). I accidentally move a folder to a different location. When tries to move it back, SVN pukes with this error. It happened once before and I managed to do some random updates/commits, not knowing what I was doing and it was "fixed". I cannot pull the same magic again, so I need to know how to get my files and directory and of tree-conflict.
Thanks!
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(6)
我不确定它现在处于什么状态,但最好的选择可能是:
svn cleanup
svn update
I'm not sure what state it's in now, but your best bet would probably be to:
svn cleanup
svn update
我有同样的错误(树冲突),但来自不同的工作流程。
查找哪个进程拥有锁。下载 Handle.exe,然后打开您解压到的文件夹。然后运行
“C:\path\handle.exe”“C:\path\FileOrFolder”
。https://technet.microsoft.com/en-us/sysinternals/bb896655.aspx重现
工作流程:
修复:
I had the same error (tree conflict), but from a different workflow.
Find what process has the lock. Download Handle.exe, and open to the folder you extracted to. Then run
"C:\path\handle.exe" "C:\path\FileOrFolder"
.https://technet.microsoft.com/en-us/sysinternals/bb896655.aspx
Workflow to reproduce:
To fix:
http://rubyjunction.us/subversion-hell-sh
编辑
这是链接中的 shell 脚本,对 Linux/Unix 用户可能有用......
http://rubyjunction.us/subversion-hell-sh
Edit
Here's the shell script from the link, which could be useful to Linux/Unix users...
当我尝试删除Linux环境下的分支时,我遇到了同样的问题。我所做的是:
再次分支以删除
我不知道问题是什么,但我在两周内经历了两次。
I had the same problem when tried to delete a branch on linux enviroment. What I did was:
branch again for removal
I don't know what the problem was but I experienced it twice in two weeks.
保留已移动的文件夹的备份。现在在 SVN 中,单击 TortoiseSVN>>已解决。
选择文件/文件夹并解决。现在更新/提交 svn 数据。
Keep a backup of the folder that you have moved. Now in SVN, click on TortoiseSVN>>Resolved.
Select the files/folder and resolve. Now update/commit the svn data.
请注意,即使您“没有执行任何操作”,也可能会发生这种情况 - 即有人在存储库中移动了您的文件夹而您对此一无所知。发生在我身上。如果是这种情况,请从存储库和 svn update 中删除问题文件夹。
Note that this can occur even if you "didn't do anything" - i.e. someone moves around folders on you in the repository and you don't know about it. Happened to me. If this is the case, delete the problem folder from your repository and
svn update
.