在Windows上,我使用以下方式创建了一个多文件差异:
我得到了以下输出:
svn diff > mydiff.diff
然后将其移植到Linux机器上(使用相同版本的相同代码库,没有更改)。我该如何应用它?执行后
patch -p0 < mydiff.diff
我得到了以下输出:
patching file licstat/test/unittest/test_licstatactioncontainers.cpp
File licstat/test/unittest/test_licstatactioncontainers.cpp is not empty after patch, as expected
patching file licstat/test/unittest/test_licstatactions.cpp
Hunk #1 FAILED at 99.
1 out of 1 hunk FAILED -- saving rejects to file licstat/test/unittest/test_licstatactions.cpp.rej
can't find file to patch at input line 295
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: licstat/test/unittest/test_licenseserverusagemap.cpp
|===================================================================
|--- licstat/test/unittest/test_licenseserverusagemap.cpp (revision 6767)
|+++ licstat/test/unittest/test_licenseserverusagemap.cpp (working copy)
--------------------------
File to patch:
最后一行是等待我执行的提示。
我应该如何创建/应用补丁才能使其正常工作?
(编辑) 现在我看到文件缺失,diff 没有创建它。手工创建文件后,我遇到了如下错误:
patching file licstat/misc/generic/mysql/stored_procedures.sql
Hunk #1 FAILED at 220.
Hunk #2 FAILED at 245.
Hunk #3 FAILED at 622.
Hunk #4 FAILED at 661.
Hunk #5 FAILED at 810.
Hunk #6 FAILED at 822.
Hunk #7 FAILED at 868.
Hunk #8 FAILED at 999.
8 out of 8 hunks FAILED -- saving rejects to file licstat/misc/generic/mysql/stored_procedures.sql.rej