Linux下patch文件生成及应用patch

文件patch

准备两个文件t1 t2

echo -e "1\n2" > t1
echo -e "1\n2\n3" > t2

通过diff命令生成patch文件

diff -u t1 t2 > file.patch

通过patch命令应用patch

patch < file.patch

or

patch t1 file.patch

or (保留原文件)

patch -b < file.patch

or (仅做检查,不实际应用)

patch --dry-run < file.patch

基于patch文件还原,也就是撤销补丁

patch -R -i file.patch

如果仅是想查看差异，建议vimdiff t1 t2更直接

目录patch

通过diff命令生成patch

diff -aurN d1 d2 > dir.patch

通过patch命令应用patch

patch -p0 < dir.patch

撤销patch

patch -R -p0 < dir.patch

-pnum 代表从哪一级应用patch文件; 例如patch文件中的/u/src/blurfl.c, -p0 就是完全匹配, -p1 u/src/blurfl.c, p2 src/blurfl.c

一般官方提供的patch文件,进入到待更新程序的根目录后执行patch -p1 < patch_file即可