Tortoisesvn跳过记录mergeinfo [英] Tortoisesvn skips recording mergeinfo
问题描述
我已经从一个svn仓库中检出了行李箱.
I have checked out the trunk from one of our svn repos.
然后我右键单击->合并->合并一些修订->从分支A合并->选择一个修订，然后最后应用合并.
I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge.
我的TortoiseSVN更新文件，并更新mergeinfo. 当我将这些更改提交到主干时，tortoisesvn会向我显示要提交的文件，以及/trunk文件夹，因为svn:mergeinfo已更新，因此受到影响.
My TortoiseSVN updates the files, and updates the mergeinfo. When I commit these changes to trunk, tortoisesvn shows me the files to commit, and also the /trunk folder which is affected because the svn:mergeinfo has been updated.
我的同事安装了完全相同的tortoisesvn，并且做的完全相同.我们有完全相同的全局忽略模式.当他执行合并过程时，主干上的svn:mergeinfo属性将不会更新.仅文件被合并.那怎么可能呢?是否有一个设置告诉Tortoisesvn在合并时不包括mergeinfo?
My colleague has the exact same tortoisesvn installed, and does exactly the same thing. We have the exact same global ignore pattern. When he does the merge procedure, the svn:mergeinfo property on the trunk won't update. Only the files is merged. How is that possible? Is there a setting which tells tortoisesvn not to include mergeinfo when merging?
推荐答案
好吧，这很尴尬. 如果您进行合并，并且要合并的URL与工作副本的结帐URL具有不同的基本URL，则将执行合并，但不会记录任何mergeinfo.
Well, this was awkward. If you do the merge and the URL to merge from has a different base URL than your working copy's checkout URL, the merge will perform, but no mergeinfo is recorded.
URL字符串中的区别是大写字母(！).因此，这意味着要合并的URL必须与您的主干完全相同，也必须与字母大小写相同.
The difference in the URL string was a capital letter(!). So this means that the URL to merge from must be exactly equal to your trunk, also the casing of letters.
这一定是tortoiseSVN中的错误吗?
This must be a bug in tortoiseSVN?
示例: 从http://****/svn/repo/trunk签出了中继 尝试从网址http://****/svn/Repo/branches/****
Example: Checked out trunk from http://****/svn/repo/trunk Try to merge from url http://****/svn/Repo/branches/****
这将进行合并，但不记录mergeinfo
This will do the merge, but not record mergeinfo
这篇关于Tortoisesvn跳过记录mergeinfo的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
