quote
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
problem causes:
quote
老外的解释
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
The general idea is that the branch is pulled from the trunk version 280 and modified. At the same time, the trunk version has been submitted many times and becomes 325. At this time, it is necessary to merge from the branch to the trunk, and several versions are missed in the middle, so it cannot be merged.
Solution: Manually select the version that needs to be merged from the source svn, do not check the original all eligible revisions when merging, check the second item select revisions on next page, as shown in the figure, and then check all the revisions involved in this merge. Version.
