我有一个补丁文件,内容如下:
Index: dir/file.xml
===================================================================
--- dir/file.xml (revision 178)
+++ dir/file.xml (working copy)
@@ -7,7 +7,7 @@
<markup>
- <markup />
+ <markup></markup>
<markup>
<markup>
@@ -20,6 +20,7 @@
<markup>
<markup>
+ <tag>
<markup>
要将它应用到SVN工作副本,我使用分支进行了分支操作:
$ svn copy -r 178 trunk/component/dir branches/mybranch
然后我尝试了
$ cd branches/mybranch
$ ls -R
./dir:
file.xml
$ patch -p0 -i ~/patchfile.patch
但是SVN的输出是
(Stripping trailing CRs from patch.)
patching file dir/file.xml
Hunk #1 FAILED at 7.
Hunk #2 FAILED at 20.
2 out of 2 hunks FAILED -- saving rejects to file dir/file.xml.rej
每个文件都要这样做吗?
什么可能导致SVN拒绝补丁?我在Unix机器上,但补丁和存储库具有Windows行尾...
谢谢帮助!