SVN X 仍然处于树冲突中

Question

我正在使用 VisualSVN(使用 Tortoise)。我不小心将文件夹移动到了不同的位置。当尝试将其移回时，SVN 因此错误而呕吐。它以前发生过一次，我设法进行了一些随机更新/提交，但不知道我在做什么并且“已修复”。我不能再次使用相同的魔法，所以我需要知道如何获取我的文件和目录以及树冲突。

谢谢!

Answer 1

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

找出有锁的进程。下载 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