svn Reintegrate can only be used if revisions through were previously merged fro

svn合并的时候,报错

svn: Reintegrate can only be used if revisions 3234 through 4332 were previously merged from svn://xxx.xxx.xx.xx/xxx/xxx/xxx/src to the reintegrate source, but this is not the case:

xxx/tags/tag-xxx-v1.0/src
Missing ranges: /xxx/xxx/src:3234-4215
xxx/tags/tag-xxx-v1.0/src/com/xxx/xxx/action/TestAction.java
Missing ranges: /xxx/xxx/src/com/xxx/xxx/action/TestAction.java:4210-4215


解决办法:
用svn档案库浏览器打开报错的svn地址,比如上边的,"Missing ranges: /xxx/xxx/src/com/xxx/xxx/action/TestAction.java:4210-4215",就用版本库浏览器找到这个文件,然后在这个文件上右键->显示属性,然后会看到Property下有一个svn:mergeinfo,点击下边的删除或者Remove按钮,删掉这个.再去合并,就好了.需要注意的是,你要合并的文件夹,下边一定任何一个文件的属性都不能有这个.不然就合并不成功.一般跟着svn报错的提示都可以找到有svn:mergeinfo的属性.

删除之后,还要update一下myeclipse上的代码.才能让文件的属性更新到本地的文件中,才能进行合并.

这个错误一度搞的我很郁闷.

[img]http://dl.iteye.com/upload/attachment/0075/3121/ac7ccdfc-b832-3600-a8ce-73a6ece84a66.png[/img]

[img]http://dl.iteye.com/upload/attachment/0075/3109/296325b7-3bbf-3467-919b-ed360a8a1e46.png[/img]

黑色头发:http://heisetoufa.iteye.com/