{"id":4253,"date":"2021-04-09T15:42:03","date_gmt":"2021-04-09T06:42:03","guid":{"rendered":"\/blog\/?p=4253"},"modified":"2025-12-08T14:27:05","modified_gmt":"2025-12-08T05:27:05","slug":"diff-patch","status":"publish","type":"post","link":"https:\/\/hasu0707.duckdns.org\/blog\/?p=4253","title":{"rendered":"diff &#038; patch"},"content":{"rendered":"\n<pre class=\"wp-block-preformatted\">\u25a0diff\ub85c patch \ud30c\uc77c \ub9cc\ub4e4\uae30<br>\/opt\/src.orig\uc640 \/opt\/src \ub450 \ub514\ub809\ud1a0\ub9ac\ub97c \ube44\uad50\ud558\uc5ec \ubcc0\uacbd \ubd80\ubd84\uc744 patch \ud30c\uc77c \ud615\ud0dc\ub85c \ucd9c\ub825\ud55c\ub2e4.<br>diff -Naur \/opt\/src.orig \/opt\/src > src.patch<br><br>\/opt\/src.orig\uc640 \/opt\/src \ub450 \ub514\ub809\ud1a0\ub9ac\ub97c \ube44\uad50\ud558\uc5ec \ubcc0\uacbd\ub41c \ud30c\uc77c\ub4e4\ub9cc \uccb4\ud06c \ud55c\ub2e4.<br>diff -qr \/opt\/src.orig \/opt\/src > src.patch<br><br><br>\u25a0diff<br>-q: \ub450 \ud30c\uc77c\uc774 \ub2e4\ub97c \uacbd\uc6b0\uc5d0\ub9cc \uc54c\ub824\uc900\ub2e4.<br>-u: unified \ucd9c\ub825 \ud615\uc2dd\uc744 \uc0ac\uc6a9\ud55c\ub2e4.<br>-q: \ub450 \ud30c\uc77c\uc758 \uc790\uc138\ud55c \ucc28\uc774\uc810\uc774 \ube44\uad50\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c, \ub2e8\uc21c\ud788 \ub450 \ud30c\uc77c\uc774 \ub2e4\ub978\uc9c0\ub9cc \uc54c\ub824\uc900\ub2e4.<br>-N, --new-file: \ub514\ub809\ud1a0\ub9ac \ube44\uad50\uc5d0\uc11c, \uc5b4\ub5a4 \ud30c\uc77c\uc774 \ud55c \ub514\ub809\ud1a0\ub9ac\uc5d0\ub9cc \uc788\ub2e4\uba74 \ub2e4\ub978 \ub514\ub809\ud1a0\ub9ac\uc5d0\ub294 \ube44\uc5b4\uc5c8\ub294 \ud30c\uc77c\uc774 \uc788\ub294 \uac83\ucc98\ub7fc \ube44\uad50\ud55c\ub2e4.<br>-r: \ub450 \ub514\ub809\ud1a0\ub9ac\ub97c \ube44\uad50\ud560 \ub54c, \ubaa8\ub4e0 \ud558\uc704 \ub514\ub809\ud1a0\ub9ac\ub294 \uc7ac\uadc0\uc801\uc73c\ub85c(recursively) \ube44\uad50\ud55c\ub2e4.<br>-a, --text: \ubaa8\ub4e0 \ud30c\uc77c\uc744 \ud14d\uc2a4\ud2b8 \ud30c\uc77c\ub85c \ucc98\ub9ac<br>    --strip-trailing-cr: \uc785\ub825 \uc2dc \ud6c4\ud589 \uce90\ub9ac\uc9c0 \ub9ac\ud134 \uc81c\uac70<br>    --binary: \uc774\uc9c4 \ubaa8\ub4dc\ub85c \ub370\uc774\ud130 \uc77d\uae30 \ubc0f \uc4f0\uae30<br><br>diff -Naur &lt;old file> &lt;new file> > test.patch<br><br><br>\u25a0patch<br>patch -p1 &lt; ..\/src.patch<br>-p1\ub294 patch \ud30c\uc77c \ub0b4 \uacbd\ub85c\uc5d0\uc11c \uc55e\uc5d0\uc11c \uba87\uac1c\ub97c \uc9c0\uc6b0\uace0 \uc801\uc6a9\ud560\uc9c0\ub97c \uba85\uc2dc\ud55c\ub2e4. p0\ub294 \uc6d0\ubcf8 \ud480\ud328\uc2a4 \uadf8\ub300\ub85c \uc801\uc6a9\ud55c\ub2e4.<br><br>patch -p1 -R &lt; main.patch<br>-R \uc635\uc158\uc740 \uc774\ubbf8 \uc801\uc6a9\ub41c \ud328\uce58\ub97c \uc81c\uac70\ud558\uc5ec \uc6d0\ubcf8\uc73c\ub85c \ub418\ub3cc\ub9b0\ub2e4.<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u25a0diff\ub85c patch \ud30c\uc77c \ub9cc\ub4e4\uae30\/opt\/src.orig\uc640 \/opt\/src \ub450 \ub514\ub809\ud1a0\ub9ac\ub97c \ube44\uad50\ud558\uc5ec \ubcc0\uacbd \ubd80\ubd84\uc744 patch \ud30c\uc77c \ud615\ud0dc\ub85c \ucd9c\ub825\ud55c\ub2e4.diff -Naur \/opt\/src.orig \/opt\/src > src.patch\/opt\/src.orig\uc640 \/opt\/src \ub450 \ub514\ub809\ud1a0\ub9ac\ub97c \ube44\uad50\ud558\uc5ec \ubcc0\uacbd\ub41c \ud30c\uc77c\ub4e4\ub9cc \uccb4\ud06c \ud55c\ub2e4.diff -qr \/opt\/src.orig \/opt\/src > src.patch\u25a0diff-q: \ub450 \ud30c\uc77c\uc774 \ub2e4\ub97c \uacbd\uc6b0\uc5d0\ub9cc \uc54c\ub824\uc900\ub2e4.-u: unified \ucd9c\ub825 \ud615\uc2dd\uc744 \uc0ac\uc6a9\ud55c\ub2e4.-q: \ub450 \ud30c\uc77c\uc758 \uc790\uc138\ud55c \ucc28\uc774\uc810\uc774 \ube44\uad50\ud558\ub294 \uac83\uc774 \uc544\ub2c8\ub77c, \ub2e8\uc21c\ud788 \ub450 \ud30c\uc77c\uc774 \ub2e4\ub978\uc9c0\ub9cc \uc54c\ub824\uc900\ub2e4.-N, &#8211;new-file: \ub514\ub809\ud1a0\ub9ac [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_import_markdown_pro_load_document_selector":0,"_import_markdown_pro_submit_text_textarea":"","site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"default","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"set","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[15],"tags":[],"class_list":["post-4253","post","type-post","status-publish","format-standard","hentry","category-computing_tools"],"_links":{"self":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/4253","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4253"}],"version-history":[{"count":0,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/4253\/revisions"}],"wp:attachment":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4253"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4253"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4253"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}