Found that when used together SVN versions of a file conflict, conflict normally file can be edited to modify, but can not edit the file, I had to choose subsequent modification options, good weird problem ah! ! ! After the resolution of other conflicts, I chose the code in development tools eclipse the modified adjusted, ready to hit the patch.
The problem again ~ ~ After playing patch to see what's inside, and discovered that only two sentences:
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream.
Figure:
I modify the contents of how not one marked? ? ? Instant ignorant force!
After investigation, using SVN tools, the right to see the file properties, find content: 
vector file, how it is inconsistent with the normal contents of the documents? View the history file records submitted version of the file attributes, after the discovery of the first administrator of SVN commit the Java file attribute is adjusted.
So, just: Right-click on the file -> SVN-related content -> Properties -> Delete the Options -> OK, the commit operation after modifying records. And then re-patch to play.