0
旁边情况:SVN:重命名特性分支发展的中期
主干支在转X - >分支机构/ BR1
...开发与周期同步干线 - > BR1
BR1更名为BR2(此时的网卡没有完全与主干同步的)
...开发与周期同步干线 - > BR2
终于BR2与叔同步runk。尝试从BR2重返干路,但TortoiseSVN显示错误是这样的:
Command: Reintegrate merge .../branches/br2 into ...wc\trunk
Error: Reintegrate can only be used if revisions 12306 through 13012 were previously
Error: merged from .../trunk to the
Error: reintegrate source, but this is not the case:
Error: branches/br2/prj1
Error: Missing ranges: /trunk/prj1:12359-12728
Error: branches/br2/prj2
Error: Missing ranges: /trunk/prj2:12847
Completed!
似乎重新命名分支是坏主意:(
所以,这种情况如何解决让再集成的网卡,然后BR2不过?目前BR1(删除)不synchronyzed与躯干和远离它