从修补程序脚本中删除行

Question

当我运行修补程序时，它在其中一个文件上失败。我想从patch.x.x.x.sh中删除相应的行，因此除了此文件外，其他所有内容都正在进行修补。

希望有人可以解释过程。

例如，我试图应用补丁SUPEE-10336，并得到错误：

[http]$ bash PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh 
Checking if patch can be applied/reverted successfully... 
ERROR: Patch can't be applied/reverted successfully. 

patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php 
patching file app/locale/en_US/Mage_Usa.csv 
Hunk #1 FAILED at 99. 
1 out of 1 hunk FAILED -- saving rejects to file app/locale/en_US/Mage_Usa.csv.rej 

我想编辑PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh所以我删除这是负责这个文件的补丁就行了。

Answer 1

我看不到任何人对这个问题感兴趣，但我想我反正发布了答案。

如果您在任何文本编辑器中打开该修补程序，并使用diff命令查找__PATCHFILE_FOLLOWS__这是合并文件的位置。在化妆的情况下它是'Mage_Usa.csv”文件是造成问题，所以我找到了补丁的负责此文件的一部分：

diff --git app/locale/en_US/Mage_Usa.csv app/locale/en_US/Mage_Usa.csv 
index 072170d..5e8f844 100644 
--- app/locale/en_US/Mage_Usa.csv 
+++ app/locale/en_US/Mage_Usa.csv 
@@ -99,7 +99,7 @@ 
"First-Class Mail Large Envelope","First-Class Mail Large Envelope" 
"First-Class Mail Large Postcards","First-Class Mail Large Postcards" 
"First-Class Mail Letter","First-Class Mail Letter" 
-"First-Class Mail Parcel","First-Class Mail Parcel" 
+"First-Class Package Service - Retail","First-Class Package Service - Retail" 
"First-Class Mail Postcards","First-Class Mail Postcards" 
"First-Class Package International Service","First-Class Package International Service" 
"First-Class Package Service","First-Class Package Service" 

我删除了补丁的这一整段，然后重新运行是SSH

这一次。

[http]$ bash PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh 
Checking if patch can be applied/reverted successfully... 
Patch was applied/reverted successfully. 

我已经手动文件Mage_Usa.csv（即我删除补丁的一部分）改变了USPS名

。