合并出错：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

合并出错：svn Working copy and merge source not ready for reintegration相关推荐

svn多分支合并主干冲突 svn Working copy and merge source not ready for reintegration
svn多分支合并主干方法分支a合并到本地主干后,本地主干提交代码到svn主干,这时主干版本改变,分支b再提交代码到主干会报冲突,版本不统一,这时的解决办法是: 方法1.将主干代码合并到分支b,提交分 ...
合并代码还在用git merge吗？我们都用git rebase！
欢迎关注方志朋的博客,回复"666"获面试宝典 git merge 和 git rebase的区别目的都是将一个分支的 commit 合并到到另外一个分支中去. git merg ...
svn working copy locked
SVN有时提交失败的时候,文件夹会被锁住,如下所示 svn: Working copy ' D:\eclipseWorkSpace\RDSYSEDUV810010\sourcecode\WebRoot ...
git merge合并时遇上refusing to merge unrelated histories的解决方案
如果git merge合并的时候出现refusing to merge unrelated histories的错误,原因是两个仓库不同而导致的,需要在后面加上--allow-unrelated-hi ...
SVN Working Copy xxx locked
SVN Working Copy xxx locked,有时用svn时会出现这样的问题. 删除隐藏文件夹.svn下的一个lock...文件.ok
NumPy学习(索引和切片，合并，分割，copy与deep copy)
NumPy学习(索引和切片,合并,分割,copy与deep copy) 目录索引和切片合并分割 copy与deep copy 索引和切片通过索引和切片可以访问以及修改数组元素的值一维数组程序示 ...
详解Git合并冲突——原因及解决 “Automatic merge failed； fix conflicts and then commit the result.“
最后更新日期:2022/10/6 在Git中使用git merge命令合并两个分支的时候,有可能产生这种情况: $ git merge A Auto-merging merge.txt CONFLIC ...
svn working copy locked问题
svn working copy locked问题 svn is already locked解决方案 1:在出错文件夹下,鼠标右键TortoiseSVN->Clean up. 2:或者手动删除 ...
SVN插件提交报错Attempted to lock an already-locked dir svn: Working copy
Attempted to lock an already-locked dirsvn: Working copy myeclipse用svn提交的时候报错: Attempted to lock an ...
SVN Working Copy xxx locked ,并且进行cleanup也还是不行
cd 到指定目录,然后执行如下命令 del lock /q/s -------------------------------------------------------------------- ...

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

合并出错：svn Working copy and merge source not ready for reintegration相关推荐

最新文章

热门文章