SVN代码回滚失败 -Cannot merge into mixed-revision working copy [1308:1309]; try updating first

SVN代码回滚失败 -Cannot merge into mixed-revision working copy [1308:1309]; try updating first

SVN回滚代码

正常情况一般都使用

svn merge -r r12:r11 .

这样来回滚代码,但是如果回滚过一次,然后:

svn ci -m "ci"//version is 13

这样再次操作svn merge的时候就会报错:

Cannot merge into mixed-revision working copy [1308:1309]; try updating first

解决方案

svn update --ignore-externals

然后继续merge就行了。

推荐阅读