在Subversion 1.5中将分支重新集成到主干时缺少范围错误消息 [英] Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

问题描述

我正在尝试将开发分支重新集成到Subversion 1.5存储库中的主干中.在执行此操作之前，我将所有更改从主干合并到了开发分支.现在，当我尝试重新集成分支中的更改时，会收到以下错误消息:

I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get the following error message:

Command: Reintegrate merge https://dev/svn/branches/devel into C:\trunk  
Error: Reintegrate can only be used if revisions 280 through 325 were previously   
Error: merged from https://dev/svn/trunk to the reintegrate   
Error: source, but this is not the case:  
Error:   branches/devel/images/test  
Error:     Missing ranges: /trunk/images/test:280-324  
...

然后，该消息继续抱怨我项目中的某些文件夹.但是，当我尝试再次合并从主干到开发分支的更改时，TortoiseSVN告诉我没有什么可以合并的(因为我之前已经合并了所有更改):

The message then goes on complaining about some folders in my project. But when I try to merge the changes from the trunk to the development branch again, TortoiseSVN tells me that there's nothing to merge (as I already merged all the changes before):

Command: Merging revisions 1-HEAD of https://dev/svn/trunk into C:\devel, respecting ancestry  
Completed: C:\devel  

我正在尝试按照此处的说明进行操作: http://svnbook.red-bean.com/zh-CN/1.5/svn.branchmerge.basicmerging.html ，但解决此类问题没有任何意义.

I'm trying to follow the instructions from here: http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html, but there's nothing about solving such a problem.

有什么想法吗?也许我应该只删除主干，然后复制我的分支?但是我不确定它是否安全.

Any ideas? Perhaps I should just delete the trunk and then make a copy of my branch? But I'm not really sure if it's safe.

与--reintegrate合并的svn抱怨关于缺少范围，但mergeinfo似乎正确

推荐答案

您必须首先将r280到r324的修订版从主干合并到您的分支中.

You have to merge the revisions r280 to r324 from trunk into your branch first.

似乎您已经将r325合并到您的分支中，但是--reintegrate需要将所有个修订版本合并到最新的修订版本.一定不能有差距. 因此，这里有一些诊断:

It seems you already merged r325 into your branch, however --reintegrate needs to get all revisions up to your latest revision merged. There must be no gap. So here a little Diag:

           +----------------------> /branches/devel
          /                    /   \<--merge not working!
 --------/-------+--+---+-----+---------> trunk
         |       \  |  /      |
        280       \ V /      325
                    V
                  missing sync merges from trunk to branch

我认为这是您的分支结构，因此您需要将所有更改从主干同步到分支.您仅合并了r325，所以只需合并r280-r324，然后执行--reintegrate

I think this is your branch structure, so you need to sync all changes from trunk to your branch. You only merged r325, so just merge r280-r324 and after doing this you should be fine to use --reintegrate

这篇关于在Subversion 1.5中将分支重新集成到主干时缺少范围错误消息的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！