{"id":85,"date":"2010-08-02T09:49:10","date_gmt":"2010-08-02T01:49:10","guid":{"rendered":"http:\/\/ipcpu.sa.cy.com\/?p=85"},"modified":"2010-08-02T09:49:10","modified_gmt":"2010-08-02T01:49:10","slug":"linux-study-diff-patch","status":"publish","type":"post","link":"https:\/\/c.ipcpu.com\/2010\/08\/linux-study-diff-patch\/","title":{"rendered":"linux\u5b66\u4e60\u7b14\u8bb0\u4e4bdiff\u548cpatch\u547d\u4ee4"},"content":{"rendered":"

\u5173\u952e\u5b57\uff1aLinux \u5b66\u4e60\u7b14\u8bb0 \u8fd0\u7ef4 \u7cfb\u7edf \u547d\u4ee4
\n\u4e00\u3001\u547d\u4ee4\u7684\u529f\u80fd<\/strong><\/p>\n

diff\u547d\u4ee4\u7684\u529f\u80fd\u4e3a\u9010\u884c\u6bd4\u8f83\u4e24\u4e2a\u6587\u672c\u6587\u4ef6\uff0c\u5217\u51fa\u5176\u4e0d\u540c\u4e4b\u5904\u3002\u53ef\u662f\u505a\u6210diff\u8bb0\u5f55\u4e5f\u5c31\u662f\u8865\u4e01\u3002
\npatch\u5c31\u662f\u5229\u7528diff\u5236\u4f5c\u7684\u8865\u4e01\u6765\u6253\u5230\u6587\u4ef6\uff08\u5939\uff09\uff0c\u4f7f\u5176\u6587\u4ef6\u6587\u4ef6\u5939\u4e00\u81f4\u3002<\/p>\n

\u4e8c\u3001\u8bed\u6cd5<\/strong><\/p>\n

diff [options] file1 file2
\npatch [options] ori < patchfile<\/p>\n

\u4e09\u3001\u4e3b\u8981\u53c2\u6570<\/strong><\/p>\n

diff [options]<\/p>\n

-a\uff1a\u5c06\u6240\u6709\u6587\u4ef6\u5f53\u4f5c\u6587\u672c\u6587\u4ef6\u6765\u5904\u7406\u3002
\n-b\u6216\u2013ignore-space-change \u3000\u5ffd\u7565\u7a7a\u683c\u9020\u6210\u7684\u4e0d\u540c\u3002
\n-B\u6216\u2013ignore-blank-lines \u3000\u5ffd\u7565\u7a7a\u884c\u9020\u6210\u7684\u4e0d\u540c\u3002
\n-c\uff1a\u4f7f\u7528\u7eb2\u8981\u8f93\u51fa\u683c\u5f0f\u3002
\n-H\uff1a\u5229\u7528\u8bd5\u63a2\u6cd5\u52a0\u901f\u5bf9\u5927\u6587\u4ef6\u7684\u641c\u7d22\u3002
\n-I\uff1a\u5ffd\u7565\u5927\u5c0f\u5199\u7684\u53d8\u5316\u3002
\n-n \u2013rcs\uff1a\u8f93\u51faRCS\u683c\u5f0f\u3002
\n-r \u662f\u4e00\u4e2a\u9012\u5f52\u9009\u9879\uff0c\u8bbe\u7f6e\u4e86\u8fd9\u4e2a\u9009\u9879\uff0cdiff\u4f1a\u5c06\u4e24\u4e2a\u4e0d\u540c\u7248\u672c\u6e90\u4ee3\u7801\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u5bf9\u5e94\u6587\u4ef6\u5168\u90e8\u90fd\u8fdb\u884c\u4e00\u6b21\u6bd4\u8f83\uff0c\u5305\u62ec\u5b50\u76ee\u5f55\u6587\u4ef6\u3002
\n-N \u9009\u9879\u786e\u4fdd\u8865\u4e01\u6587\u4ef6\u5c06\u6b63\u786e\u5730\u5904\u7406\u5df2\u7ecf\u521b\u5efa\u6216\u5220\u9664\u6587\u4ef6\u7684\u60c5\u51b5\u3002
\n-u \u9009\u9879\u4ee5\u7edf\u4e00\u683c\u5f0f\u521b\u5efa\u8865\u4e01\u6587\u4ef6\uff0c\u8fd9\u79cd\u683c\u5f0f\u6bd4\u7f3a\u7701\u683c\u5f0f\u66f4\u7d27\u51d1\u4e9b\u3002<\/p>\n

patch [options]<\/p>\n

-p0 \u9009\u9879\u8981\u4ece\u5f53\u524d\u76ee\u5f55\u67e5\u627e\u76ee\u7684\u6587\u4ef6\uff08\u5939\uff09
\n-p1 \u9009\u9879\u8981\u5ffd\u7565\u6389\u7b2c\u4e00\u5c42\u76ee\u5f55\uff0c\u4ece\u5f53\u524d\u76ee\u5f55\u5f00\u59cb\u67e5\u627e\u3002
\n\u56db\u3001diff\u4f7f\u7528\u65b9\u6cd5\u7684\u5b9e\u4f8b\u8bf4\u660e<\/span><\/strong><\/p>\n

\u4f8b\u5982\uff1a diff \/usr\/xu mine
\n\u628a\u76ee\u5f55\/usr\/xu \u4e2d\u540d\u4e3amine\u7684\u6587\u4ef6\u4e0e\u5f53\u524d\u76ee\u5f55\u4e2d\u7684mine\u6587\u4ef6\u8fdb\u884c\u6bd4\u8f83\u3002
\n\u901a\u5e38\u8f93\u51fa\u7531\u4e0b\u8ff0\u5f62\u5f0f\u7684\u884c\u7ec4\u6210\uff1a
\nn1 a n3\uff0cn4
\nn1\uff0cn2 d n3
\nn1\uff0cn2 c n3\uff0cn4 \u8fd9\u4e9b\u884c\u7c7b\u4f3ced\u547d\u4ee4\u628afilel\u8f6c\u6362\u6210file2\u3002\u5b57\u6bcd(a\u3001d\u548cc)\u4e4b\u524d\u7684\u884c\u53f7(n1\uff0cn2)\u662f\u9488\u5bf9file1\u7684\uff0c\u5176\u540e\u9762\u7684\u884c\u53f7(n3\uff0cn4)\u662f\u9488\u5bf9file2\u7684\u3002\u5b57\u6bcda\u3001d\u548cc\u5206\u522b\u8868\u793a\u9644\u52a0\u3001\u5220\u9664\u548c\u4fee\u6539\u64cd\u4f5c\u3002
\n\u5728\u4e0a\u8ff0\u5f62\u5f0f\u7684\u6bcf\u4e00\u884c\u7684\u540e\u9762\u8ddf\u968f\u53d7\u5230\u5f71\u54cd\u7684\u82e5\u5e72\u884c\uff0c\u4ee5\u201d<\u201d\u6253\u5934\u7684\u884c\u5c5e\u4e8e\u7b2c\u4e00\u4e2a\u6587\u4ef6\uff0c\u4ee5\u201d>\u201d\u6253\u5934\u7684\u884c\u5c5e\u4e8e\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u3002
\ndiff\u80fd\u533a\u522b\u5757\u548c\u5b57\u7b26\u8bbe\u5907\u6587\u4ef6\u4ee5\u53caFIFO(\u7ba1\u9053\u6587\u4ef6)\uff0c\u4e0d\u4f1a\u628a\u5b83\u4eec\u4e0e\u666e\u901a\u6587\u4ef6\u8fdb\u884c\u6bd4\u8f83\u3002
\n\u5982\u679cfile1\u548cfile2\u90fd\u662f\u76ee\u5f55\uff0c\u5219diff\u4f1a\u4ea7\u751f\u5f88\u591a\u4fe1\u606f\u3002
\n###\u6b64\u5904\u53ef\u4ee5\u4f7f\u7528-y\u9009\u9879\u5c06\u4e24\u4e2a\u6587\u4ef6\u5185\u5bb9\u5206\u663e\u793a\u5728\u5de6\u53f3\u4e24\u4fa7\u3002<\/p>\n

\u4e94\u3001diff\u548cpatch\u6700\u5e38\u7528\u7684\u8865\u4e01\u529f\u80fd<\/strong><\/p>\n

diff\u6709\u5f88\u591a\u529f\u80fd\u5e73\u65f6\u6211\u4eec\u4e0d\u5e38\u7528\u5230\uff0c\u6700\u5e38\u7528\u7684\u529f\u80fd\u83ab\u8fc7\u4e8e\u751f\u6210patch\u6587\u4ef6\u4e86\uff1a
\ndiff -urN old\/ new\/ > mysoft.patch
\n\u53c2\u6570 -u \u8868\u793a\u4f7f\u7528 unified \u683c\u5f0f\uff0c-r \u8868\u793a\u6bd4\u8f83\u76ee\u5f55\uff0c-N \u8868\u793a\u5c06\u4e0d\u5b58\u5728\u7684\u6587\u4ef6\u5f53\u4f5c\u7a7a\u6587\u4ef6\u5904\u7406\uff0c\u8fd9\u6837\u65b0\u6dfb\u52a0\u7684\u6587\u4ef6\u4e5f\u4f1a\u51fa\u73b0\u5728patch\u6587\u4ef6\u4e2d\u3002<\/p>\n

\u7136\u540e\u5728\u9700\u8981\u5e94\u7528patch\u7684\u5730\u65b9\u4f7f\u7528\u4e0b\u8ff0\u547d\u4ee4\u5373\u53ef\uff1a
\npatch -p0 < mysoft.patch
\ndiff\u7684 -y \u547d\u4ee4(\u957f\u683c\u5f0f\u4e3a \u2013side-by-side)\u53ef\u4ee5\u5c06\u5c4f\u5e55\u5206\u6210\u5de6\u53f3\u4e24\u90e8\u5206\uff0c\u6765\u6bd4\u8f83\u4e24\u4e2a\u6587\u4ef6\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u8bb8\u591a\u56fe\u5f62\u5316\u7684\u6bd4\u8f83\u5de5\u5177\u90fd\u6709\u8fd9\u4e2a\u529f\u80fd\uff0c\u4f46\u5982\u679c\u53ea\u80fd\u4f7f\u7528\u547d\u4ee4\u884c\uff0c\u8fd9\u4e2a\u53c2\u6570 \u5c31\u76f8\u5f53\u6709\u7528\u4e86\u3002\u5982\u679c\u8981\u6539\u53d8\u5de6\u53f3\u5404\u90e8\u5206\u7684\u5bbd\u5ea6\uff0c\u53ef\u4ee5\u901a\u8fc7 -W (\u2013width)\u53c2\u6570\u6765\u6307\u5b9a\u3002
\n\u2013ignore-blank-lines \u53c2\u6570\u53ef\u4ee5\u4e0d\u68c0\u67e5\u7a7a\u767d\u884c\u3002\u8fd9\u6837DOS\u683c\u5f0f\u548cUnix\u683c\u5f0f\u7684\u6587\u4ef6\u4e92\u76f8\u6bd4\u8f83\u65f6\uff0c\u5c31\u4e0d\u81f3\u4e8e\u56e0\u4e3a\u6362\u884c\u7b26\u4e0d\u4e00\u81f4\u800c\u51fa\u73b0\u5927\u91cf\u7684\u5dee\u5f02\u3002<\/p>\n

\u516d\u3001\u4f8b\u5b50<\/strong><\/p>\n

[root@vps ~]# cat ipcpu\/123.txt
\n\u4f60\u597d\u54e6\u554a
\n[root@vps ~]# cat ipcpu0\/123.txt
\n\u4f60\u597d\u54e6\u554a
\n\u5403\u996d\u4e86\u6ca1\u5440
\n[root@vps ~]# diff -urN ipcpu ipcpu0 > ipcpu.patch<\/p>\n

[root@vps ~]# patch -p0 < ipcpu.patch
\npatching file ipcpu\/123.txt
\n[root@vps ~]# cat ipcpu\/123.txt
\n\u4f60\u597d\u54e6\u554a
\n\u5403\u996d\u4e86\u6ca1\u5440
\n[root@vps ~]#<\/p>\n

\u5173\u4e8epatch\u7684\u8d44\u6599\u4e0d\u662f\u5f88\u591a\uff0c\u8fd8\u8981\u591a\u591a\u5b66\u4e60\u3002<\/span><\/strong><\/p>\n

\u53c2\u8003\u8d44\u6599\uff1a
\n<\/strong>http:\/\/www.9usb.net\/200903\/linux-diff.html<\/a>
\nhttp:\/\/dev.firnow.com\/course\/6_system\/linux\/Linuxjs\/200875\/130414.html<\/a><\/p>\n

\u63a8\u8350\u4e00\u7bc7\u6587\u7ae0\uff1a\u5341\u5206\u949f\u638c\u63e1diff&patch\u7528\u6cd5<\/strong><\/p>\n

http:\/\/hi.baidu.com\/thinkinginlamp\/blog\/item\/e78f9c82a1a022b56d811930.html<\/a><\/p>\n

\u7cbe\u5f69\u8bc4\u8bba\uff1a<\/p>\n

\u00a0hds | #1
\nMarch 9, 2011 at 11:15 am
\n\u6709\u4e9b\u7248\u672c\u7684patch p\u548c0 \u4e4b\u95f4\u8981\u52a0\u7a7a\u683c
\nhttp:\/\/blogold.chinaunix.net\/u2\/68236\/showart_686359.html
\n\u8fd9\u4e2a\u94fe\u63a5\u53ef\u4ee5\u53c2\u8003\u4e00\u4e0b<\/p>\n

====<\/p>\n

\u672c\u6587\u6062\u590d\u81ea\u5feb\u7167<\/p>\n

\u8f6c\u8f7d\u8bf7\u6ce8\u660e\uff1aIPCPU-\u7f51\u7edc\u4e4b\u8def<\/a> » linux\u5b66\u4e60\u7b14\u8bb0\u4e4bdiff\u548cpatch\u547d\u4ee4<\/a><\/p>","protected":false},"excerpt":{"rendered":"

\u5173\u952e\u5b57\uff1aLinux \u5b66\u4e60\u7b14\u8bb0 \u8fd0\u7ef4 \u7cfb\u7edf \u547d\u4ee4 \u4e00\u3001\u547d\u4ee4\u7684\u529f\u80fd diff\u547d\u4ee4\u7684\u529f\u80fd\u4e3a\u9010\u884c\u6bd4\u8f83\u4e24\u4e2a\u6587\u672c\u6587\u4ef6\uff0c\u5217\u51fa\u5176\u4e0d\u540c\u4e4b\u5904\u3002\u53ef\u662f\u505a\u6210diff\u8bb0\u5f55\u4e5f\u5c31\u662f\u8865\u4e01\u3002 patch\u5c31\u662f\u5229\u7528diff\u5236\u4f5c\u7684\u8865\u4e01\u6765\u6253\u5230\u6587\u4ef6\uff08\u5939\uff09\uff0c\u4f7f\u5176\u6587\u4ef6\u6587\u4ef6\u5939\u4e00\u81f4\u3002 \u4e8c\u3001\u8bed\u6cd5 diff [options] file1 file2 patch [options] ori < patchfile \u4e09\u3001\u4e3b\u8981\u53c2\u6570 diff [options] -a\uff1a\u5c06\u6240\u6709\u6587\u4ef6\u5f53\u4f5c\u6587\u672c\u6587\u4ef6\u6765\u5904\u7406\u3002 -b\u6216\u2013ignore-space-change \u3000\u5ffd\u7565\u7a7a\u683c\u9020\u6210\u7684\u4e0d\u540c\u3002 -B\u6216\u2013ignore-blank-lines \u3000\u5ffd\u7565\u7a7a\u884c\u9020\u6210\u7684\u4e0d\u540c\u3002 -c\uff1a\u4f7f\u7528\u7eb2\u8981\u8f93\u51fa\u683c\u5f0f\u3002 -H\uff1a\u5229\u7528\u8bd5\u63a2\u6cd5\u52a0\u901f\u5bf9\u5927\u6587\u4ef6\u7684\u641c\u7d22\u3002 -I\uff1a\u5ffd\u7565\u5927\u5c0f\u5199\u7684\u53d8\u5316\u3002 -n \u2013rcs\uff1a\u8f93\u51faRCS\u683c\u5f0f\u3002 -r \u662f\u4e00\u4e2a\u9012\u5f52\u9009\u9879\uff0c\u8bbe\u7f6e\u4e86\u8fd9\u4e2a\u9009\u9879\uff0cdiff\u4f1a\u5c06\u4e24\u4e2a\u4e0d\u540c\u7248\u672c\u6e90\u4ee3\u7801\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u5bf9\u5e94\u6587\u4ef6\u5168\u90e8\u90fd\u8fdb\u884c\u4e00\u6b21\u6bd4\u8f83\uff0c\u5305\u62ec\u5b50\u76ee\u5f55\u6587\u4ef6\u3002 -N \u9009\u9879\u786e\u4fdd\u8865\u4e01\u6587\u4ef6\u5c06\u6b63\u786e\u5730\u5904\u7406\u5df2\u7ecf\u521b\u5efa\u6216\u5220\u9664\u6587\u4ef6\u7684\u60c5\u51b5\u3002 -u \u9009\u9879\u4ee5\u7edf\u4e00\u683c\u5f0f\u521b\u5efa\u8865\u4e01\u6587\u4ef6\uff0c\u8fd9\u79cd\u683c\u5f0f\u6bd4\u7f3a\u7701\u683c\u5f0f\u66f4\u7d27\u51d1\u4e9b\u3002 patch [options] -p0 \u9009\u9879\u8981\u4ece\u5f53\u524d\u76ee\u5f55\u67e5\u627e\u76ee\u7684\u6587\u4ef6\uff08\u5939\uff09 -p1 \u9009\u9879\u8981\u5ffd\u7565\u6389\u7b2c\u4e00\u5c42\u76ee\u5f55\uff0c\u4ece\u5f53\u524d\u76ee\u5f55\u5f00\u59cb\u67e5\u627e\u3002 \u56db\u3001diff\u4f7f\u7528\u65b9\u6cd5\u7684\u5b9e\u4f8b\u8bf4\u660e \u4f8b\u5982\uff1a diff \/usr\/xu mine \u628a\u76ee\u5f55\/usr\/xu \u4e2d\u540d\u4e3amine\u7684\u6587\u4ef6\u4e0e\u5f53\u524d\u76ee\u5f55\u4e2d\u7684mine\u6587\u4ef6\u8fdb\u884c\u6bd4\u8f83\u3002 \u901a\u5e38\u8f93\u51fa\u7531\u4e0b\u8ff0\u5f62\u5f0f\u7684\u884c\u7ec4\u6210\uff1a n1 a n3\uff0cn4 n1\uff0cn2 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[13],"tags":[17],"_links":{"self":[{"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/posts\/85"}],"collection":[{"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/comments?post=85"}],"version-history":[{"count":0,"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/posts\/85\/revisions"}],"wp:attachment":[{"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/media?parent=85"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/categories?post=85"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/c.ipcpu.com\/wp-json\/wp\/v2\/tags?post=85"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}