合并出错：svn Working copy and merge source not ready for reintegration

合并时提示如下信息：

    Working copy and merge source not ready for reintegration

svn: Reintegrate can only be used if revisions 6129 through 8011 were previously merged from svn://x.x.x.x/sms/client to the reintegrate source, but this is not the case:

  sms/branch/agent/client

    Missing ranges: /sms/client:7656,7837,7861,7988

解决步骤：

1、右键分支项目的“team”>"设置属性"

2、在打开的窗口中输入下图所示的值，文本属性中的svn路径为主干的路径，版本号填合并出错提示的即可。输入完保存，再次提交一下分支项目到svn。
 

 

//==========================方法2===============================================

错误信息 
Working copy and merge source not ready for reintegration 
svn: 'svn://xxx/TestImpl.java@4530' must be ancestrally related to 'svn://xxx/TestImpl.java@4394' 

    Merge completed abnormally. 

在使用svn的merge过程中,遇到了N多的麻烦 

这次遇到的麻烦的具体表现为: 
在主干合并分支中的代码,报错 

解决办法为: 
假如需要合并的文件名为:TestImpl.java 
1.在主干的文件上,右键->Team->Copy->选择分支的路径->OK. 
2.到分支的文件夹中找到新copy进来的文件,就是Copy Of TestImpl.java 
3.把分支的TestImpl.java改名为TestImpl2.java 
4.把Copy Of TestImpl.java改名为TestImpl.java 
5.把TestImpl2.java的内容全部覆盖掉TestImpl.java中的内容 
6.把TestImpl.java文件名中的TestImpl2全部改为TestImpl 
7.删除Copy Of TestImpl.java 
8.提交分支的TestImpl.java 
9.在主干的TestImpl.java上进行合并.这个时候svn就不报错了,可以正常的合并代码了 

 

//==========================方法3===============================================

 

subclipse merge Missing ranges解决办法

引用

merge https://repo.ds.sss.com.cn:8443/svn/paypromos E:/workspace/src/main/java/compay/paypromos
    Working copy and merge source not ready for reintegration
svn: Reintegrate can only be used if revisions 176680 through 185351 were previously merged from https://repo.ds.sss.com.cn:8443/svn/paypromos to the reintegrate source, but this is not the case:
  pangu/pre/paypromos
    Missing ranges: pangu/paypromos:184165

   问题原因：

引用

老外的解释


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

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

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

   大意是，从主干版本280拉出来分支，进行修改，同时主干版本已提交多次，变为325，此时要从分支合并到主干，中间错过了好几个版本，因此无法合并。

   解决办法：手动选择需要从源svn合并过来的版本，合并时不要勾选原来的all eligible revisions，勾选第二项select revisions on next page，如图所示，然后勾选所有涉及这次合并的版本。

转载于:https://www.cnblogs.com/MeridaChen/p/7098457.html