svn合并错误“无法获取目录的文本内容”
[英]svn merge error “can't get text contents of a directory”
问题描述
I try to merge changes from one revision in trunk to the branch. 
我尝试将更改从主干中的一个修订合并到分支。 I use the option "Merge a range of revisions" in Tortoise SVN. 我在Tortoise SVN中使用了“合并一系列修订”选项。 I get following error. 我收到以下错误。 Do you have any clue what is wrong? 你有什么头绪吗？
1 个解决方案
解决方案1
0 2014-11-03 04:01:45
You are trying to merge a directory ( http://192.168.1.3/svn/elma/sq/elmasq/trunk ) into a file ( D:/Projects/Elma_Optimization_Temp/c_parcmd.cpp ), hence the error Can't get text contents of a directory . 您正在尝试将目录（ http://192.168.1.3/svn/elma/sq/elmasq/trunk ）合并到文件（ D:/Projects/Elma_Optimization_Temp/c_parcmd.cpp ）中，因此出现错误Can't get text contents of a directory 。
On the Merge revision range dialogue (your second attached screenshot), try providing http://192.168.1.3/svn/elma/sq/elmasq/trunk/c_parcmd.cpp (or wherever that file is located in the repo trunk) as the URL to merge from (the first text field on that dialogue). 在“ Merge revision range对话框（第二幅截图）上，尝试提供http://192.168.1.3/svn/elma/sq/elmasq/trunk/c_parcmd.cpp （或该文件在回购主干中的任何位置）作为URL to merge from （该对话框的第一个文本字段）。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.