subclipse merge Missing ranges解决办法

[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
[/quote]

问题原因：
[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

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

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

[img]http://dl2.iteye.com/upload/attachment/0102/6977/38e74131-4066-37f7-9067-8f096fcd9906.jpg[/img]