ubuntu下patch打补丁

-prj0/prj0name ---------

diff -uNr prj0/prj1name prj1/prj1name

--- prj0/prj1name 1970-01-01 08:00:00.000000000 +0800 +++ prj1/prj1name 2006-08-18 09:26:36.000000000 +0800 @@ -0,0 +1,3 @@ +---------

+prj1/prj1name +---------

diff -uNr prj0/test0 prj1/test0

--- prj0/test0 2006-08-18 09:23:53.000000000 +0800 +++ prj1/test0 1970-01-01 08:00:00.000000000 +0800 @@ -1,3 +0,0 @@ -111111 -111111 -111111

diff -uNr prj0/test1 prj1/test1

--- prj0/test1 1970-01-01 08:00:00.000000000 +0800 +++ prj1/test1 2006-08-18 09:26:00.000000000 +0800 @@ -0,0 +1,4 @@ +222222 +111111 +222222 +111111

[armlinux@lqm patch]$ ls

prj0 prj1 prj1.patch test0 test1 test1.patch [armlinux@lqm patch]$ cp prj1.patch ./prj0 [armlinux@lqm patch]$ cd prj0

[armlinux@lqm prj0]$ patch -p1 < prj1.patch patching file prj0name patching file prj1name patching file test0 patching file test1

[armlinux@lqm prj0]$ ls prj1name prj1.patch test1

[armlinux@lqm prj0]$ patch -R -p1 < prj1.patch patching file prj0name patching file prj1name patching file test0 patching file test1

[armlinux@lqm prj0]$ ls prj0name prj1.patch test0

－－－－－－－－－－－－－－－－－－－ 总结一下：

单个文件

diff –uN from-file to-file >to-file.patch patch –p0 < to-file.patch patch –RE –p0 < to-file.patch

多个文件

diff –uNr from-docu to-docu >to-docu.patch patch –p1 < to-docu.patch patch –R –p1

－－－－－－－－－－－－－－－－－