{"id":563,"date":"2024-08-14T15:07:34","date_gmt":"2024-08-14T07:07:34","guid":{"rendered":"https:\/\/thereisno.top:4430\/?p=563"},"modified":"2024-08-14T17:11:29","modified_gmt":"2024-08-14T09:11:29","slug":"diff-%e7%94%9f%e6%88%90%e8%a1%a5%e4%b8%81-%e6%89%93%e8%a1%a5%e4%b8%81","status":"publish","type":"post","link":"https:\/\/thereisno.top\/?p=563","title":{"rendered":"diff \u751f\u6210\u8865\u4e01 \u6253\u8865\u4e01"},"content":{"rendered":"\n<p>1\u3001\u751f\u6210\u8865\u4e01<\/p>\n\n\n\n<p>diff -rabBup file1 file2&gt; patch1<\/p>\n\n\n\n<p>diff \u3010\u9009\u9879\u3011 \u6e90\u6587\u4ef6\uff08\u5939\uff09 \u76ee\u7684\u6587\u4ef6\uff08\u5939\uff09&nbsp;<\/p>\n\n\n\n<p><strong><em>-r<\/em><\/strong>\uff1a\u9012\u5f52\uff0c\u8bbe\u7f6e\u540e<em>diff<\/em>\u4f1a\u5c06\u4e24\u4e2a\u4e0d\u540c\u7248\u672c\u6e90\u4ee3\u7801\u76ee\u5f55\u4e2d\u7684\u6240\u6709\u5bf9\u5e94\u6587\u4ef6\u90fd\u8fdb\u884c\u4e00\u6b21\u6bd4\u8f83\uff0c\u5305\u62ec\u5b50\u76ee\u5f55\u6587\u4ef6\uff1b&nbsp;<\/p>\n\n\n\n<p><strong><em>-N<\/em><\/strong>\uff1a\u786e\u4fdd\u8865\u4e01\u6587\u4ef6\u5c06\u6b63\u786e\u5730\u5904\u7406\u5df2\u7ecf\u521b\u5efa\u6216\u5220\u9664\u6587\u4ef6\u7684\u60c5\u51b5\uff1b&nbsp;<\/p>\n\n\n\n<p><strong><em>-u<\/em><\/strong>\uff1a\u4e00\u4f53\u5316<em>diff<\/em>\u8f93\u51fa\uff08\u53c2\u89c1\u4f8b1\uff09&nbsp;<\/p>\n\n\n\n<p>-E, -b, -w, -B, \u2013strip-trailing-cr&nbsp;<\/p>\n\n\n\n<p>\u5ffd\u7565\u5404\u79cd\u7a7a\u767d\uff0c\u53ef\u53c2\u89c1\u6587\u6863\uff0c\u6309\u9700\u9009\u7528\u3002<\/p>\n\n\n\n<p>-u \u663e\u793a\u6709\u5dee\u5f02\u884c\u7684\u524d\u540e\u51e0\u884c(\u4e0a\u4e0b\u6587), \u9ed8\u8ba4\u662f\u524d\u540e\u54043\u884c, \u8fd9\u6837, patch\u4e2d\u5e26\u6709\u66f4\u591a\u7684\u4fe1\u606f.<\/p>\n\n\n\n<p>-p \u663e\u793a\u4ee3\u7801\u6240\u5728\u7684c\u51fd\u6570\u7684\u4fe1\u606f.<\/p>\n\n\n\n<p>2\u3001\u6253\u8865\u4e01<\/p>\n\n\n\n<p><strong>patch \u547d\u4ee4<\/strong><\/p>\n\n\n\n<p>patch\u7684\u4f5c\u7528\u5219\u662f\u5c06diff\u8bb0\u5f55\u7684\u7ed3\u679c\uff08\u5373\u8865\u4e01\uff09\u5e94\u7528\u5230\u76f8\u5e94\u6587\u4ef6\uff08\u5939\uff09\u4e0a\u3002\u6700\u5e38\u89c1\u7684\u7528\u6cd5\u4e3a\uff1a<\/p>\n\n\n\n<p><em>patch -pNUM &lt;\u8865\u4e01\u6587\u4ef6&nbsp;<\/em><\/p>\n\n\n\n<p><strong><em>&#8211;<\/em><\/strong><strong>p Num\uff1a\u5ffd\u7565\u51e0\u5c42\u6587\u4ef6\u5939\uff0c\u968f\u540e\u8be6\u89e3\uff1b&nbsp;<\/strong><\/p>\n\n\n\n<p><strong>-E<\/strong><strong> <\/strong><strong>\uff1a\u8bf4\u660e\u5982\u679c\u53d1\u73b0\u4e86\u7a7a\u6587\u4ef6\uff0c\u90a3\u4e48\u5c31\u5220\u9664\u5b83\uff1b&nbsp;<\/strong><\/p>\n\n\n\n<p><strong>-R\uff1a\u53d6\u6d88\u6253\u8fc7\u7684\u8865\u4e01\u3002<\/strong><\/p>\n\n\n\n<p>\u4e3a\u4e86\u89e3\u91ca -p \u53c2\u6570\uff0c\u9700\u8981\u770b\u770b\u5982\u4e0bpatch\u6587\u4ef6\u7247\u6bb5\uff1a<\/p>\n\n\n\n<p><em>&#8212; old\/modules\/pcitable&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mon Sep 27 11:03:56 1999<\/em><br><em>+++ new\/modules\/pcitable&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Tue Dec 19 20:05:41 2000<\/em><\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u5982\u679c\u4f7f\u7528\u53c2\u6570-p0\uff0c\u90a3\u5c31\u8868\u793a\u5ffd\u7565\u5f53\u524dold\u6587\u4ef6\u5939\u5f00\u59cb\u6267\u884cpatch\u64cd\u4f5c\uff1b<\/li>\n\n\n\n<li>\u5982\u679c\u4f7f\u7528\u53c2\u6570-p1\uff0c\u8868\u793a\u5ffd\u7565\u7b2c\u4e00\u5c42\u76ee\u5f55\uff08\u5373\u4e0d\u7ba1old\uff09\uff0c\u4ece modules \u6587\u4ef6\u5939\u5f00\u59cb\u8fdb\u884cpatch\u64cd\u4f5c\u3002<\/li>\n<\/ul>\n\n\n\n<p><strong>\u5e94\u7528<\/strong><\/p>\n\n\n\n<p>\u5229\u7528\u4ee5\u4e0a\u547d\u4ee4\uff0c\u5904\u7406\u5355\u4e2a\u6587\u4ef6\u8865\u4e01\u7684\u65b9\u6cd5\uff1a<\/p>\n\n\n\n<p><strong><em># \u4ea7\u751f\u8865\u4e01<\/em><\/strong><br>diff -uN file1 file2 &gt;file.patch<\/p>\n\n\n\n<p><strong><em># \u6253\u8865\u4e01<\/em><\/strong><br>patch -p0 &lt; file.patch<\/p>\n\n\n\n<p><strong><em># \u53d6\u6d88\u8865\u4e01<\/em><\/strong><br>patch -RE -p0 &lt; file.patch<\/p>\n\n\n\n<p>\u5bf9\u6574\u4e2a\u6587\u4ef6\u5939\u6253\u8865\u4e01\u7684\u60c5\u51b5\uff1a<\/p>\n\n\n\n<p><strong><em># \u4ea7\u751f\u8865\u4e01<\/em><\/strong><br>diff -uNr dir1 dir2&nbsp; &gt;dir.patch<\/p>\n\n\n\n<p><strong><em># \u6253\u8865\u4e01<\/em><\/strong><br>cd dir2<br>patch -p1 &lt; dir.patch<\/p>\n\n\n\n<p><strong><em># \u53d6\u6d88\u8865\u4e01<\/em><\/strong><br>patch -R -p1 &lt;dir.patch<\/p>\n\n\n\n<p><strong>patch \u6587\u4ef6\u6784\u6210<\/strong><\/p>\n\n\n\n<p>\u8865\u4e01\u6587\u4ef6\u91cc\u5230\u5e95\u5b58\u50a8\u4e86\u54ea\u4e9b\u4fe1\u606f\u5462\uff1f\u770b\u770b\u8fd9\u4e2a\u4f8b\u5b50\uff1a<\/p>\n\n\n\n<p><em>&#8212; test0 2006-08-18 09:12:01.000000000 +0800<\/em><br><em>+++ test1 2006-08-18 09:13:09.000000000 +0800<\/em><br>@@ -1,3 +1,4 @@<br>+222222<br>&nbsp;111111<br>-111111<br>+222222<br>&nbsp;111111<\/p>\n\n\n\n<p><strong>\u8865\u4e01\u5934<\/strong>&nbsp;<\/p>\n\n\n\n<p>\u8865\u4e01\u5934\u662f\u5206\u522b\u7531\u2014\/+++\u5f00\u5934\u7684\u4e24\u884c\uff0c\u7528\u6765\u8868\u793a\u8981\u6253\u8865\u4e01\u7684\u6587\u4ef6\u3002\u2014\u5f00\u5934\u8868\u793a\u65e7\u6587\u4ef6\uff0c+++\u5f00\u5934\u8868\u793a\u65b0\u6587\u4ef6\u3002<\/p>\n\n\n\n<p><strong>\u4e00\u4e2a\u8865\u4e01\u6587\u4ef6\u4e2d\u7684\u591a\u4e2a\u8865\u4e01<\/strong>&nbsp;<\/p>\n\n\n\n<p>\u4e00\u4e2a\u8865\u4e01\u6587\u4ef6\u4e2d\u53ef\u80fd\u5305\u542b\u4ee5\u2014\/+++\u5f00\u5934\u7684\u5f88\u591a\u8282\uff0c\u6bcf\u4e00\u8282\u7528\u6765\u6253\u4e00\u4e2a\u8865\u4e01\u3002\u6240\u4ee5\u5728\u4e00\u4e2a\u8865\u4e01\u6587\u4ef6\u4e2d\u53ef\u4ee5\u5305\u542b\u597d\u591a\u4e2a\u8865\u4e01\u3002<\/p>\n\n\n\n<p><strong>\u5757<\/strong>&nbsp;<\/p>\n\n\n\n<p>\u5757\u662f\u8865\u4e01\u4e2d\u8981\u4fee\u6539\u7684\u5730\u65b9\u3002\u5b83\u901a\u5e38\u7531\u4e00\u90e8\u5206\u4e0d\u7528\u4fee\u6539\u7684\u4e1c\u897f\u5f00\u59cb\u548c\u7ed3\u675f\u3002\u4ed6\u4eec\u53ea\u662f\u7528\u6765\u8868\u793a\u8981\u4fee\u6539\u7684\u4f4d\u7f6e\u3002\u4ed6\u4eec\u901a\u5e38\u4ee5@@\u5f00\u59cb\uff0c\u7ed3\u675f\u4e8e\u53e6\u4e00\u4e2a\u5757\u7684\u5f00\u59cb\u6216\u8005\u4e00\u4e2a\u65b0\u7684\u8865\u4e01\u5934\u3002<\/p>\n\n\n\n<p><strong>\u5757\u7684\u7f29\u8fdb<\/strong>&nbsp;<\/p>\n\n\n\n<p>\u5757\u4f1a\u7f29\u8fdb\u4e00\u5217\uff0c\u800c\u8fd9\u4e00\u5217\u662f\u7528\u6765\u8868\u793a\u8fd9\u4e00\u884c\u662f\u8981\u589e\u52a0\u8fd8\u662f\u8981\u5220\u9664\u7684\u3002<\/p>\n\n\n\n<p><strong>\u5757\u7684\u7b2c\u4e00\u5217<\/strong>&nbsp;+\u53f7\u8868\u793a\u8fd9\u4e00\u884c\u662f\u8981\u52a0\u4e0a\u7684\u3002-\u53f7\u8868\u793a\u8fd9\u4e00\u884c\u662f\u8981\u5220\u9664\u7684\u3002\u6ca1\u6709\u52a0\u53f7\u4e5f\u6ca1\u6709\u51cf\u53f7\u8868\u793a\u8fd9\u91cc\u53ea\u662f\u5f15\u7528\u7684\u800c\u4e0d\u9700\u8981\u4fee\u6539\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>1\u3001\u751f\u6210\u8865\u4e01 diff -rabBup file1 file2&gt; patch1 diff \u3010\u9009\u9879\u3011 \u6e90\u6587 &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/thereisno.top\/?p=563\" class=\"more-link\">\u7ee7\u7eed\u9605\u8bfb<span class=\"screen-reader-text\">\u201cdiff \u751f\u6210\u8865\u4e01 \u6253\u8865\u4e01\u201d<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[15],"tags":[109,2],"class_list":["post-563","post","type-post","status-publish","format-standard","hentry","category-git","tag-diff","tag-git"],"_links":{"self":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/563","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=563"}],"version-history":[{"count":2,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/563\/revisions"}],"predecessor-version":[{"id":565,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/563\/revisions\/565"}],"wp:attachment":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=563"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=563"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=563"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}