LinuxÏÂPatchµÄÓ¦ÓúÍÖÆ×÷·½·¨½éÉÜ(2)

2019-03-03 13:20

Ò»¸ö²¹¶¡ÎļþÖпÉÄܰüº¬ÒÔ---/+++¿ªÍ·µÄºÜ¶à½Ú£¬Ã¿Ò»½ÚÓÃÀ´´òÒ»¸ö²¹¶¡¡£ËùÒÔÔÚÒ»¸ö²¹¶¡ÎļþÖпÉÒÔ°üº¬ºÃ¶à¸ö²¹¶¡¡£

¿é

¿éÊDz¹¶¡ÖÐÒªÐ޸ĵĵط½¡£Ëüͨ³£ÓÉÒ»²¿·Ö²»ÓÃÐ޸ĵĶ«Î÷¿ªÊ¼ºÍ½áÊø¡£ËûÃÇÖ»ÊÇÓÃÀ´±íʾҪÐ޸ĵÄλÖá£ËûÃÇͨ³£ÒÔ@@¿ªÊ¼£¬½áÊøÓÚÁíÒ»¸ö¿éµÄ¿ªÊ¼»òÕßÒ»¸öеIJ¹¶¡Í·¡£

¿éµÄËõ½ø

¿é»áËõ½øÒ»ÁУ¬¶øÕâÒ»ÁÐÊÇÓÃÀ´±íʾÕâÒ»ÐÐÊÇÒªÔö¼Ó»¹ÊÇҪɾ³ýµÄ¡£

¿éµÄµÚÒ»ÁÐ

+ºÅ±íʾÕâÒ»ÐÐÊÇÒª¼ÓÉϵġ£

-ºÅ±íʾÕâÒ»ÐÐÊÇҪɾ³ýµÄ¡£

ûÓмӺÅҲûÓмõºÅ±íʾÕâÀïÖ»ÊÇÒýÓõĶø²»ÐèÒªÐ޸ġ£

************************************************************

***diffÃüÁî»áÔÚ²¹¶¡ÎļþÖмǼÕâÁ½¸öÎļþµÄÊ״δ´½¨Ê±¼ä£¬ÈçÏÂ***

--- test0 2006-08-18 09:12:01.000000000 +0800

+++ test1 2006-08-18 09:13:09.000000000 +0800

@@ -1,3 +1,4 @@

+222222

111111

-111111

+222222

111111

[armlinux@lqm patch]$ patch -p0 < test1.patch

patching file test0

[armlinux@lqm patch]$ ls

test0 test1 test1.patch

[armlinux@lqm patch]$ cat test0

222222

111111

222222

111111

3¡¢¿ÉÒÔÈ¥³ý²¹¶¡£¬»Ö¸´¾É°æ±¾

[armlinux@lqm patch]$ patch -RE -p0 < test1.patch

patching file test0

[armlinux@lqm patch]$ ls

test0 test1 test1.patch

[armlinux@lqm patch]$ cat test0

111111

111111

111111

¶þ¡¢Îª¶à¸öÎļþ½øÐв¹¶¡²Ù×÷

1¡¢´´½¨²âÊÔÎļþ¼Ð

[armLinux@lqm patch]$ mkdir prj0

[armlinux@lqm patch]$ cp test0 prj0

[armlinux@lqm patch]$ ls

prj0 test0 test1 test1.patch

[armlinux@lqm patch]$ cd prj0/

[armlinux@lqm prj0]$ ls

test0

[armlinux@lqm prj0]$ cat >>prj0name<

> --------

> prj0/prj0name

> --------

> EOF

[armlinux@lqm prj0]$ ls

prj0name test0

[armlinux@lqm prj0]$ cat prj0name

--------

prj0/prj0name

--------

[armlinux@lqm prj0]$ cd ..

[armlinux@lqm patch]$ mkdir prj1

[armlinux@lqm patch]$ cp test1 prj1

[armlinux@lqm patch]$ cd prj1

[armlinux@lqm prj1]$ cat >>prj1name<

> ---------

> prj1/prj1name

> ---------

> EOF

[armlinux@lqm prj1]$ cat prj1name

---------

prj1/prj1name

---------

[armlinux@lqm prj1]$ cd ..

2¡¢´´½¨²¹¶¡

[armlinux@lqm patch]$ diff -uNr prj0 prj1 > prj1.patch

[armlinux@lqm patch]$ more prj1.patch

diff -uNr prj0/prj0name prj1/prj0name

--- prj0/prj0name 2006-08-18 09:25:11.000000000 +0800

+++ prj1/prj0name 1970-01-01 08:00:00.000000000 +0800

@@ -1,3 +0,0 @@

---------

-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


LinuxÏÂPatchµÄÓ¦ÓúÍÖÆ×÷·½·¨½éÉÜ(2).doc ½«±¾ÎĵÄWordÎĵµÏÂÔØµ½µçÄÔ ÏÂÔØÊ§°Ü»òÕßÎĵµ²»ÍêÕû£¬ÇëÁªÏµ¿Í·þÈËÔ±½â¾ö£¡

ÏÂһƪ£ºÍø°É¹ÜÀíϵͳ±ÏÒµÉè¼Æ

Ïà¹ØÔĶÁ
±¾ÀàÅÅÐÐ
¡Á ×¢²á»áÔ±Ãâ·ÑÏÂÔØ£¨ÏÂÔØºó¿ÉÒÔ×ÔÓɸ´ÖƺÍÅŰ棩

ÂíÉÏ×¢²á»áÔ±

×¢£ºÏÂÔØÎĵµÓпÉÄÜ¡°Ö»ÓÐĿ¼»òÕßÄÚÈݲ»È«¡±µÈÇé¿ö£¬ÇëÏÂÔØÖ®Ç°×¢Òâ±æ±ð£¬Èç¹ûÄúÒѸ¶·ÑÇÒÎÞ·¨ÏÂÔØ»òÄÚÈÝÓÐÎÊÌ⣬ÇëÁªÏµÎÒÃÇЭÖúÄã´¦Àí¡£
΢ÐÅ£º QQ£º