尝试从分支合并时出现 SVN 错误
我正在尝试将单个文件和单个修订版的更改从分支合并到主干。
我使用 VisualSVN 作为前端。
于是我右键点击该文件,Visual SVN -> 合并,然后选择“合并一系列修订版”,然后输入修订版号(来自日志)并单击“下一步”。 然后我单击“测试合并”
我得到的是以下错误:
'http://subversion.tigris.org/xmlns/dav/md5-checksum资源上不存在“”。
有什么想法为什么会发生这种情况吗?
I'm trying to merge changes from a branch to the trunk, for a single file and a single revision.
I'm using VisualSVN as the front-end.
So I right-click the file, Visual SVN -> Merge, then select ‘Merge a range of revisions’, then enter the revision number (from the log) and hit Next. Then I click ‘Test Merge’
What I get is the following error:
'http://subversion.tigris.org/xmlns/dav/md5-checksum' was not present on the resource.
Any ideas why this is happening?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
耶! 一位同事发现了这个问题。
即使我右键单击文件并单击“合并”,“合并自”URL 仍被设置为分支的顶级文件夹。
它应该指定文件的完整路径和文件名
现在我变得更明智了。 :)
Yay! A colleague figured out the problem.
Even though I was right-clicking on the file and clicking 'Merge', the 'merge from' URL was set to the top-level folder of the branch.
It should have specified the full path and filename of the file
Now I'm all the wiser. :)
我收到了相同的错误消息,但是,事实证明存储库中存在一个空文件(实际上是 0(零)字节)。 显然 SVN 不知道如何处理。 删除该文件后,一切又恢复正常了。
I got the same error message, however, it turned out that an empty file (literally 0 (zero) bytes) was located in the repository. Apparently something SVN doesn't know how to handle. After removing this file, everything did work again.