diff 和patch
2010-11-30 13:06
176 查看
比较两个目录制作patch,只是两个文件的话那么不要-r
diff -Nur 源目录 改动后的目录 > 文件名.patch
比如diff -Nur DirectFB-1.4.3 DirectFB-1.4.3-patched > 1.patch
打patch的时候,patch -p1 < 文件名.patch
p1意思是忽略掉patch文件的第一层目录,所以需要在DirectFB-1.4.3目录下去执行patch
patch执行时有个优先查找的问题:
diff -Nur DirectFB-1.4.3/configure DirectFB-1.4.3-patched/configure
--- DirectFB-1.4.3/configure 2009-12-09 03:39:29.000000000 +0800
+++ DirectFB-1.4.3-patched/configure 2010-11-30 12:47:23.000000000 +0800
patch会优先查找+++的路径,如果不存在就会去找---的路径. 如果有就采用本文出自 “叶落花开” 博客,请务必保留此出处http://wb127.blog.51cto.com/2232662/436442
diff -Nur 源目录 改动后的目录 > 文件名.patch
比如diff -Nur DirectFB-1.4.3 DirectFB-1.4.3-patched > 1.patch
打patch的时候,patch -p1 < 文件名.patch
p1意思是忽略掉patch文件的第一层目录,所以需要在DirectFB-1.4.3目录下去执行patch
patch执行时有个优先查找的问题:
diff -Nur DirectFB-1.4.3/configure DirectFB-1.4.3-patched/configure
--- DirectFB-1.4.3/configure 2009-12-09 03:39:29.000000000 +0800
+++ DirectFB-1.4.3-patched/configure 2010-11-30 12:47:23.000000000 +0800
patch会优先查找+++的路径,如果不存在就会去找---的路径. 如果有就采用本文出自 “叶落花开” 博客,请务必保留此出处http://wb127.blog.51cto.com/2232662/436442
相关文章推荐
- 使用diff和patch制作及打补丁
- Linux下使用diff和patch制作及打补丁(已经实践可行!)
- diff和patch命令简介
- shell学习四十七天----文件比较cmp,diff,patch
- git diff 利用打patch的方式移植分支间的改动
- diff和patch
- Linux diff与patch的深入分析
- patch和diff
- diff和patch使用
- diff 与 patch
- 文本处理命令sort和uniq,文件比较和应用更改命令diff、patch
- linux -- Linux diff与patch的深入分析
- diff和patch
- svn diff 和patch的使用
- Linux中使用diff生成补丁与用patch打补丁
- diff and patch
- diff和patch
- diff和patch使用总结
- diff和patch
- 用Diff和Patch工具维护源码