SVN X仍然存在树冲突

Question

我正在使用VisualSVN(使用Tortoise).我不小心将文件夹移动到其他位置.当试图将其移回时,SVN会发现此错误.它发生过一次,我设法做了一些随机的更新/提交,不知道我在做什么,它是"修复".我不能再次使用相同的魔法了,所以我需要知道如何获取我的文件和目录以及树冲突.

谢谢!

Answer 1

我不确定它现在处于什么状态,但你最好的选择可能是:

1. 将文件夹完全移出存储库
2. 做一个 svn cleanup
3. 做一个 svn update
4. 从文件夹中复制文件(不包含.svn文件),覆盖刚刚更新的旧源文件.

Answer 2

我有同样的错误(树冲突),但来自不同的工作流程.

找出哪个进程有锁.下载Handle.exe,并打开您解压缩到的文件夹.然后跑"C:\path\handle.exe" "C:\path\FileOrFolder".

https://technet.microsoft.com/en-us/sysinternals/bb896655.aspx

要重现的工作流程:

- delete folder (having one of the files locked by a program that is within this folder)
- commit parent folder of folder you deleted, and look for red text of the folder you deleted (it should be brown, not red if there aren't issues in SVN)

修理:

- forcefully kill the lock (or close the program so it releases the lock)
- run cleanup command on folder you deleted
- revert folder you deleted
- delete folder you deleted
- commit parent folder of folder you deleted