{"id":3935,"date":"2022-03-04T16:57:51","date_gmt":"2022-03-04T07:57:51","guid":{"rendered":"https:\/\/www.agtech.co.jp\/blog\/?p=3935"},"modified":"2022-03-04T16:57:51","modified_gmt":"2022-03-04T07:57:51","slug":"patch-file-creation","status":"publish","type":"post","link":"https:\/\/www.agtech.co.jp\/blog\/2022\/03\/patch-file-creation\/","title":{"rendered":"\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3092\u52b9\u7387\u7684\u306b Araxis Merge \u3067\u4f5c\u6210"},"content":{"rendered":"

\r\n\t\"\"\r\n<\/p>\r\n\r\n\r\n

\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u4e0d\u5177\u5408\u306e\u4fee\u6b63\u3084\u5c0f\u898f\u6a21\u306a\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u884c\u3046\u305f\u3081\u306b\u3001\u30d1\u30c3\u30c1\uff08\u30aa\u30ea\u30b8\u30ca\u30eb\u30d5\u30a1\u30a4\u30eb\u306b\u66f4\u65b0\u5185\u5bb9\u3092\u53cd\u6620\u3055\u305b\u308b\u305f\u3081\u3001\u5dee\u5206\u60c5\u5831<\/strong>\u306e\u307f\u3092\u542b\u3081\u305f\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u3092\u4f5c\u6210\u3057\u3066\u9069\u7528\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\r\n\r\n\r\n

\u3053\u306e\u4f5c\u696d\u3092\u884c\u3046\u305f\u3081\u306b\u306f\u3001UNIX\/Linux \u306e\u57fa\u672c\u7684\u306a\u30b3\u30de\u30f3\u30c9 diff<\/strong> \u3092\u4f7f\u7528\u3057\u3066\u6b21\u306e\u3088\u3046\u306b\u8a18\u8ff0\u3057\u3001\u5dee\u5206\u3092 unified\uff08\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\uff09\u5f62\u5f0f\u3067\u66f8\u304d\u51fa\u3057\u3066\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3055\u308c\u3066\u3044\u308b\u65b9\u3082\u591a\u3044\u306e\u3067\u306f\u306a\u3044\u3067\u3057\u3087\u3046\u304b\u3002<\/p>\r\n\r\n\r\n

\r\n\t\u4f8b\uff1a
\r\n
\r\n$ diff -u(\u307e\u305f\u306f -c) \u5909\u66f4\u524d\u306e\u30d5\u30a1\u30a4\u30eb \u5909\u66f4\u5f8c\u306e\u30d5\u30a1\u30a4\u30eb > \u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u540d \r\n<\/pre>\r\n<\/div>\r\n\r\n\r\n
Araxis Merge\u3067\u306f\u3001\u3053\u306e\u3088\u3046\u306a\u624b\u7d9a\u304d\u3092\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03\u306e\u30ea\u30dc\u30f3\u30dc\u30bf\u30f3\"\"\u3067\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03\u6642\u306b\u3053\u306e\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u5225\u30bf\u30d6\u3067\u5dee\u5206\uff08diff\uff09<\/strong>\u3092\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u3067\u4f5c\u6210\u30fb\u8868\u793a\u3057\u3001\u3055\u3089\u306b\u305d\u308c\u3092\u30d1\u30c3\u30c1\u3068\u3057\u3066\u4fdd\u5b58\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<\/p>\r\n\r\n\r\n
\u3053\u306e\u30d6\u30ed\u30b0\u3067\u306f\u3001Python \u3092\u4f8b\u306b\u3001Araxis Merge \u3067\u5b9f\u73fe\u3059\u308b\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u65b9\u6cd5\u306e\u52d8\u6240\u3092\u3054\u7d39\u4ecb\u3057\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\r\n\r\n\r\n
\u305d\u308c\u3067\u306f\u5177\u4f53\u7684\u306b Python \u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u306e\u5909\u66f4\u524d\u5f8c\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6bd4\u8f03\u3057\u3001\u5dee\u5206\u3092\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u3067\u51fa\u529b\u3057\u3066\u3001\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u4fdd\u5b58\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\r\n\r\n\r\n
\r\n\t\u5909\u66f4\u524d\u306e\u30d5\u30a1\u30a4\u30eb\uff08python-gui-chart.py\uff09\u3068\u5909\u66f4\u5f8c\u306e\u30d5\u30a1\u30a4\u30eb\uff08python-gui-chart_edit.py\uff09\u3092\u305d\u308c\u305e\u308c\u958b\u304d\u3001\u6bd4\u8f03\u5b9f\u884c\u5f8c\u306b\u300c\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9 diff\u300d\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af<\/strong>
\r\n\t\"\"<\/a>\r\n\t
\r\n\t\t\u56f3\uff11\uff0e\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9 diff \u30dc\u30bf\u30f3
\r\n\t\t\uff08\u753b\u50cf\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u65b0\u3057\u3044\u30bf\u30d6\u3067\u753b\u50cf\u304c\u958b\u304d\u307e\u3059\u3002\uff09\r\n\t<\/p>\r\n<\/div>\r\n\r\n\r\n\r\n
\r\n\t
\u5909\u66f4\u524d\u306e\u30d5\u30a1\u30a4\u30eb\uff08python-gui-chart.py\uff09\u3068\u5909\u66f4\u5f8c\u306e\u30d5\u30a1\u30a4\u30eb\uff08python-gui-chart_edit.py\uff09\u306e\u5dee\u5206\u3092\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u3067\u5225\u30bf\u30d6\u306b\u51fa\u529b<\/strong><\/p>\r\n\t\r\n\t
\u203b\u5909\u66f4\u7b87\u6240\u3068\u305d\u306e\u524d\u5f8c 3 \u884c\u3092 UNIX\uff08LF\uff09\u6539\u884c\u30b3\u30fc\u30c9\u3067\u533a\u5207\u308a\u3001–<\/span> \u8a18\u53f7\u3068 + \u8a18\u53f7\u3067\u5909\u66f4\u7b87\u6240\u304c\u793a\u3055\u308c\u307e\u3059\u3002<\/span><\/strong><\/p>\r\n\r\n\t\"\"<\/a>\r\n\t
\r\n\t\t\u56f3\uff12\uff0ePython \u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3001\u5909\u66f4\u524d\u5f8c\u306e\u5dee\u5206\u7d50\u679c\uff08Unified \u5f62\u5f0f\uff09
\r\n\t\t\uff08\u203b\u753b\u50cf\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u65b0\u3057\u3044\u30bf\u30d6\u3067\u753b\u50cf\u304c\u958b\u304d\u307e\u3059\u3002\uff09\r\n\t<\/p>\r\n<\/div>\r\n\r\n\r\n
\r\n\t
\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u306e\u51fa\u529b\u306e\u898b\u65b9\u306e\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001diff \u30b3\u30de\u30f3\u30c9\u306e\u8aac\u660e\u30b5\u30a4\u30c8\u3092\u3054\u53c2\u7167\u304f\u3060\u3055\u3044\u3002<\/p>\r\n<\/div>\r\n\r\n\r\n
\u3053\u306e\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u306e\u5dee\u5206\u306f\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u3001\u30ea\u30dc\u30f3\u306b\u3042\u308b\u4fdd\u5b58\u30dc\u30bf\u30f3\"\"\u3092\u4f7f\u7528\u3057\u3066\u4fdd\u5b58\u3059\u308b\u304b\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\uff1a\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb .patch<\/strong>\uff09\u3001\u307e\u305f\u306f\u5225\u306e\u5834\u6240\u3078\u30b3\u30d4\u30fc&\u30da\u30fc\u30b9\u30c8\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\r\n\r\n\r\n
\r\n\t
\u30e1\u30e2\uff1a<\/strong>\u4e0a\u8a18\u4ee5\u5916\u306e\u65b9\u6cd5\u3067\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u306e\u5dee\u5206\uff08diff\uff09\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3001\u307e\u305f\u306f\u3001\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u4ee5\u5916\u306e\u7a2e\u985e\u306e\u30ec\u30dd\u30fc\u30c8\u3092\u4f5c\u6210\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u6bd4\u8f03\u30ec\u30dd\u30fc\u30c8\u306e\u751f\u6210<\/a>\u306e UNIX diff<\/strong> \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\r\n<\/div>\r\n\r\n\r\n
\u3055\u3089\u306b\u3001\u3053\u3053\u3067\u751f\u6210\u3057\u305f\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f\u306e\u5dee\u5206\u306f\u30d1\u30c3\u30c1\u3068\u3057\u3066\u6d3b\u7528\u3067\u304d\u307e\u3059\u3002Araxis Merge \u306e\u6a19\u6e96\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03\u306e\u5225\u30d0\u30fc\u30b8\u30e7\u30f3\uff3b\u30d1\u30c3\u30c1\u7528\u306e\u65b0\u898f\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03<\/strong><\/a>\uff3d\u3067\u306f\u3001\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3067\u8a18\u8ff0\u3055\u308c\u305f\u30cf\u30f3\u30af<\/strong>\uff08\u5dee\u5206\u3092\u8868\u3059\u30b3\u30fc\u30c9\u30d6\u30ed\u30c3\u30af\u306e\u96c6\u307e\u308a\uff09\u3092\u78ba\u8a8d\u3057\u3001\u305d\u308c\u3089\u3092\u9078\u629e\u7684\u306b\uff08\u30d1\u30c3\u30c1\u304c\u5f53\u3066\u3089\u308c\u3066\u3044\u306a\u3044\uff09\u5143\u306e\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3078\u9069\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\r\n\r\n\r\n\"\"<\/a>\r\n
\u56f3\uff13\uff0e\u30d1\u30c3\u30c1\u6bd4\u8f03\u753b\u9762
\r\n\t\uff08\u203b\u753b\u50cf\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u65b0\u3057\u3044\u30bf\u30d6\u3067\u753b\u50cf\u304c\u958b\u304d\u307e\u3059\u3002\uff09\r\n<\/p>\r\n\r\n\r\n
\r\n\t
\u3053\u306e\u30d1\u30c3\u30c1\u7528\u306e\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03\u306f\u3001\u4e00\u822c\u7684\u306b\u4f7f\u7528\u3055\u308c\u308b git diff\u3001git format-patch\u3001hg diff\u3001diff -u<\/strong> \u306a\u3069\u306e\u30c4\u30fc\u30eb\u3067\u4f5c\u6210\u3055\u308c\u305f\u3001\u30c6\u30ad\u30b9\u30c8\u30d9\u30fc\u30b9\u306e\u30d1\u30c3\u30c1\u30d5\u30a1\u30a4\u30eb\u3082\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\r\n<\/div>\r\n\r\n\r\n
\uff3b\u30d1\u30c3\u30c1\u7528\u306e\u65b0\u898f\u30c6\u30ad\u30b9\u30c8\u6bd4\u8f03<\/strong>\uff3d\u306e\u5404\u30da\u30a4\u30f3\u306e\u8aac\u660e\u3084\u64cd\u4f5c\u3001\u304a\u3088\u3073\u67d4\u8edf\u306b\u884c\u3048\u308b\u30d1\u30c3\u30c1\u9069\u7528\u306e\u8a73\u3057\u3044\u624b\u9806\u306b\u3064\u3044\u3066\u306f\u3001\u3053\u3061\u3089<\/a>\u3092\u3054\u53c2\u7167\u304f\u3060\u3055\u3044\u3002<\/p>\r\n\r\n\r\n
Araxis Merge \u306f\u3001\u3055\u307e\u3056\u307e\u306a\u4f5c\u696d\u52b9\u7387\u306e\u6539\u5584\u306b\u304a\u5f79\u7acb\u3066\u3044\u305f\u3060\u3051\u308b\u30c4\u30fc\u30eb\u3067\u3059\u3002\u3053\u306e\u60c5\u5831\u304c\u7686\u69d8\u306e\u3053\u308c\u304b\u3089\u306e\u696d\u52d9\u306b\u5c11\u3057\u3067\u3082\u304a\u5f79\u7acb\u3066\u3044\u305f\u3060\u3051\u305f\u3089\u5e78\u3044\u3067\u3059\u3002Araxis Merge \u3067\u306f\u3001\u8a55\u4fa1\u7248<\/a>\u3092\u3054\u7528\u610f\u3057\u3066\u304a\u308a\u307e\u3059\u306e\u3067\u3001\u305c\u3072\u3001\u304a\u8a66\u3057\u304f\u3060\u3055\u3044\u3002<\/p>","protected":false},"excerpt":{"rendered":"\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u4e0d\u5177\u5408\u306e\u4fee\u6b63\u3084\u5c0f\u898f\u6a21\u306a\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u884c\u3046\u305f\u3081\u306b\u3001\u30d1\u30c3\u30c1\uff08\u30aa\u30ea\u30b8\u30ca\u30eb\u30d5\u30a1\u30a4\u30eb\u306b\u66f4\u65b0\u5185\u5bb9\u3092\u53cd\u6620\u3055\u305b\u308b\u305f\u3081\u3001\u5dee\u5206\u60c5\u5831\u306e\u307f\u3092\u542b\u3081\u305f\u30d7\u30ed\u30b0\u30e9\u30e0\uff09\u3092\u4f5c\u6210\u3057\u3066\u9069\u7528\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002 \u3053\u306e\u4f5c\u696d\u3092\u884c\u3046\u305f\u3081\u306b\u306f\u3001UNIX\/L […]","protected":false},"author":1,"featured_media":3936,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[1],"tags":[],"product":[88,89],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/posts\/3935"}],"collection":[{"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/comments?post=3935"}],"version-history":[{"count":2,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/posts\/3935\/revisions"}],"predecessor-version":[{"id":7631,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/posts\/3935\/revisions\/7631"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/media\/3936"}],"wp:attachment":[{"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/media?parent=3935"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/categories?post=3935"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/tags?post=3935"},{"taxonomy":"product","embeddable":true,"href":"https:\/\/www.agtech.co.jp\/blog\/wp-json\/wp\/v2\/product?post=3935"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}