我该如何解释补丁输出?

时间:2014-05-13 03:43:33

标签: diff patch

我正在尝试手动应用一些补丁,并想知道我是否正确解释了最后几行。他们在这里:

patching file frameworks/opt/telephony/tests/telephonytests/src/com/android/internal    /telephony/gsm/UsimDataDownloadCommands.java
Hunk #1 succeeded at 651 with fuzz 2 (offset 21 lines).
can't find file to patch at input line 404
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/packages/apps/Phone/src/com/android/phone/PhoneInterfaceManager.java      b/packages/apps/Phone/src/com/android/phone/PhoneInterfaceMan
ager.java
|index 6600ae5..2ae6739 100644
|--- a/packages/apps/Phone/src/com/android/phone/PhoneInterfaceManager.java
|+++ b/packages/apps/Phone/src/com/android/phone/PhoneInterfaceManager.java
--------------------------
File to patch: smartcard-api.patch

UsimDataDownloadCommands.java文件打补丁好吗? Fuzz意味着,补丁实用程序找到了目标字符串的匹配项,但它位于不同的行。对?

PhoneInterfaceManager.java文件怎么样?我在我的目录中有这个文件。但我不知道该怎么办,因为我没有相关的拒绝文件供我使用?对404行的引用是什么?这是我补丁中的行号吗? 谢谢

0 个答案:

没有答案