SVN E200009: 'xxx@2x.png': a peg revision is not allowed here-优快云博客

本文链接：https://blog.youkuaiyun.com/monkey_cool/article/details/11604557

我使用的是mac，svn是1.8，在合并主干代码到分支的时候，要解决冲突，发现有些tree的冲突不能解决，报错

E200009: 'HXJBP/Images/icon_edit@2x.png': a peg revision is not allowed here

这是咋回事呢？

百度一下，擦啥也没找到有用的。

无奈，google吧。

一艘之下，果然还是google给力啊。

解决问题的地址：http://stackoverflow.com/questions/757435/how-to-escape-characters-in-subversion-managed-file-names

解决问题的方案：

The perceptive reader is probably wondering at this point whether the peg revision syntax causes problems for working copy paths or URLs that actually have at signs in them. After all, how does svnknow whether news@11 is the name of a directory in my tree or just a syntax for “revision 11 ofnews”? Thankfully, while svn will always assume the latter, there is a trivial workaround. You need only append an at sign to the end of the path, such as news@11@. svn cares only about the last at sign in the argument, and it is not considered illegal to omit a literal peg revision specifier after that at sign. This workaround even applies to paths that end in an at sign—you would use filename@@to talk about a file named filename@.