SVN 在 Reintegrate 所出的問題,及相關的解決方法
阿新 • • 發佈:2019-02-03
今天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:
> 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即可。
兩個步驟的操作如下圖。