linux下的patch命令

svn 装在linux服务器上，现有本地项目PlatformApplication想和svn上的项目对比生成diff补丁aa之后利用aa patch到服务器上的PlatformApplication，把svn上的项目进行更新，diff文件得到方法是本地项目中svn diff >c:\aa得到的diff补丁为:
Index: .classpath
===================================================================
--- .classpath (°汾 1821)
+++ .classpath (¹¤ط¸±±¾)
@@ -8,6 +8,6 @@
  </classpathentry>
  <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
  <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_05"/>
  <classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: .project
===================================================================
--- .project (°汾 1821)
+++ .project (¹¤ط¸±±¾)
@@ -1,37 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>PlatformApplication</name>
- <comment></comment>
- <projects>
- <project>Framework</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>PlatformApplication</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Index: WebContent/WEB-INF/lib/cdp-framework.jar
===================================================================
Ϟ·¨Дʾ: τ¼�ª¶�ᑍ¡£
svn:mime-type = application/octet-stream
Index: .settings/org.eclipse.wst.common.component
===================================================================
--- .settings/org.eclipse.wst.common.component (°汾 1821)
+++ .settings/org.eclipse.wst.common.component (¹¤ط¸±±¾)
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="PlatformApplication">
-        <wb-resource deploy-path="/" source-path="/WebContent"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <dependent-module archiveName="Framework.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Framework/Framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="PlatformApplication"/>
-        <property name="java-output-path" value="/PlatformApplication/build/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="PlatformApplication">
+        <wb-resource deploy-path="/" source-path="/WebContent"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="PlatformApplication"/>
+        <property name="java-output-path" value="/PlatformApplication/build/classes"/>
+    </wb-module>
+</project-modules>
用服务器上项目patch，得到如下结果，请问这是很么原因？我怎么才能patch成功？
另外，为什么我的diff文件中存在乱码。怎么解决呢？谢谢cpserver@king:~/web/mywork/PlatformApplication$ patch -p0 < ../aa
(Stripping trailing CRs from patch.)
patching file .classpath
Hunk #1 FAILED at 8.
1 out of 1 hunk FAILED -- saving rejects to file .classpath.rej
(Stripping trailing CRs from patch.)
patching file .project
(Stripping trailing CRs from patch.)
patching file .settings/org.eclipse.wst.common.component
cpserver@king:~/web/mywork/PlatformApplication$