如果您尝试将分支重新集成到主干,并且从TortoiseSVN看到此类错误:
![Merge reintegrate test only failed!: "Reintegrate can only be used if some revisions were previously merged from trunk, but this is not the case"](https://i.imgur.com/MOtKx1f.png)
单击错误文本,按CTRL+A、CTRL+C复制所有文本。
将文本粘贴到此PowerShell脚本的here-string中:
@"
Command: Reintegrate merge http://svn.cloudcorp.com/branches/myproject into C:\Users\iain\Documents\Repositories\CloudCorp\trunk
Error: Reintegrate can only be used if revisions 18089 through 18612 were previously
Error: merged from http://svn.corp.skyscanner.local/svn/SkyScannerDatabase/trunk to
Error: the reintegrate source, but this is not the case:
Error:
Error: branches/myproject/userdata/usermanagementservice
Error:
Error: Missing ranges:
Error: /trunk/userdata/usermanagementservice:18365,18404
Error:
Error: branches/myproject/userdata/auto_create_db.sql
Error:
Error: Missing ranges:
Error: /trunk/userdata/auto_create_db.sql:18406
Error:
Error:
Error: branches/myproject/userdata/create_audit_tables_triggers_uds.sql
Error:
Error: Missing ranges:
Error: /trunk/userdata/create_audit_tables_triggers_uds.sql:18406
"@ -split "`n" |
? { $_ -match ('Error: +branches') } |
% { $_.Substring($_.IndexOf('userdata')) } |
% { "svn propdel svn:mergeinfo $_" }
该脚本提取具有问题合并信息的文件的相对路径,并输出每个文件修复所需的命令列表。
您可能需要更改'userdata'
值以适应您的存储库结构。
执行该脚本以输出您需要删除问题合并信息所需的命令。
在此示例中,该脚本将生成以下输出:
svn propdel svn:mergeinfo userdata/usermanagementservice
svn propdel svn:mergeinfo userdata/auto_create_db.sql
svn propdel svn:mergeinfo userdata/create_audit_tables_triggers_uds.sql
在命令提示符下,您可以导航到分支基础(myproject)并执行命令以删除问题合并信息。
您应该看到类似于以下的输出:
property 'svn:mergeinfo' deleted from 'userdata\usermanagementservice'.
property 'svn:mergeinfo' deleted from 'userdata\auto_create_db.sql'.
property 'svn:mergeinfo' deleted from 'userdata\create_audit_tables_triggers_uds.sql'.
就像Gray的回答中所述,现在您应该将更改提交到分支并尝试重新集成。这次应该可以成功!