今天Reintegrate代码时,不知道是不是误操作,Reintegrate失败,报错类似下文(我已经无法重现问题了,只能在网上找一个类似的):
>svn: Reintegrate can only be used if revisions 28608 through 29679 were previously merged from
> https://myserver/trunk to the reintegrate source, but this is not the case:
> branch/workflow/src/definition/whoisoptout
> Missing ranges: /trunk/workflow/src/definition/whoisoptout:29575-29675
> branch/workflow/src/mail/templates/whoisoptout
> Missing ranges: /trunk/workflow/src/mail/templates/whoisoptout:29575-29675
> branch/workflow/test/definition/whoisoptout
> Missing ranges: /trunk/workflow/test/definition/whoisoptout:29575-29675
从查到的资料来看,错误的成因是Reintegrate的源路径中的些个目录的mergeinfo出了问题。我没有查到mergeinfo到底出了什么问题。但是查到了一个解决方法。就是把源目录中有问题的mergeinfo删除掉。
首先,我们要确认有问题目录的上一层目录已经有mergeinfo,然后即除有问题目录的mergeinfo即可。
>svn: Reintegrate can only be used if revisions 28608 through 29679 were previously merged from
> https://myserver/trunk to the reintegrate source, but this is not the case:
> branch/workflow/src/definition/whoisoptout
> Missing ranges: /trunk/workflow/src/definition/whoisoptout:29575-29675
> branch/workflow/src/mail/templates/whoisoptout
> Missing ranges: /trunk/workflow/src/mail/templates/whoisoptout:29575-29675
> branch/workflow/test/definition/whoisoptout
> Missing ranges: /trunk/workflow/test/definition/whoisoptout:29575-29675
两个步骤的操作如下图。