{"id":466,"date":"2012-11-26T17:09:16","date_gmt":"2012-11-26T08:09:16","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=466"},"modified":"2019-10-31T19:22:54","modified_gmt":"2019-10-31T10:22:54","slug":"version-control-diffs-patches","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/version-control-diffs-patches","title":{"rendered":"\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3068\u306f : Diff \u3068 Patch"},"content":{"rendered":"
\u3053\u306e\u6295\u7a3f\u306f \u30a2\u30c8\u30e9\u30b7\u30a2\u30f3 DVCS \u30ac\u30a4\u30c9<\/a> \u306e\u4e00\u90e8\u3067\u3059 \u00bb<\/div>\n

\u4eca\u56de\u306e\u30d6\u30ed\u30b0 \u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u5927\u90e8\u5206\u306f Steve Losh \u6c0f\u3068\u306e\u5171\u540c\u57f7\u7b46\u306b\u3088\u308b\u3082\u306e\u3067\u3059\u3002Steve \u6c0f\u306f\u30d7\u30ed\u30b0\u30e9\u30de\u30fc\u3001\u5199\u771f\u5bb6\u3001\u30d6\u30eb\u30fc\u30b9 \u30c0\u30f3\u30b5\u30fc\u3001\u305d\u3057\u3066\u30df\u30e5\u30fc\u30b8\u30b7\u30e3\u30f3\u3067\u3059\u3002Steve \u6c0f\u306e \u30d7\u30ed\u30b8\u30a7\u30af\u30c8<\/a> \u3092\u53c2\u7167\u3057\u3001\u5f7c\u306e\u30af\u30fc\u30eb\u306a\u53d6\u308a\u7d44\u307f\u3092\u3054\u89a7\u304f\u3060\u3055\u3044\u3002\u307e\u305f\u3001\u5f7c\u306e Bitbucket \u30a2\u30ab\u30a6\u30f3\u30c8<\/a> \u7d4c\u7531\u3067\u30bd\u30fc\u30b9 \u30b3\u30fc\u30c9\u3092\u78ba\u8a8d\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/em><\/p>\n

\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3078\u306e\u5207\u308a\u66ff\u3048<\/h2>\n

\u591a\u304f\u306e\u500b\u4eba\u3001\u30c1\u30fc\u30e0\u3001\u305d\u3057\u3066\u7d44\u7e54\u306f Git \u3084 Mercurial (Hg) \u306a\u3069\u306e \u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u3078\u306e\u5207\u308a\u66ff\u3048<\/strong> \u3092\u691c\u8a0e\u3057\u3066\u3044\u307e\u3059\u3002\u4eca\u5f8c\u6570\u9031\u9593\u306b\u308f\u305f\u3063\u3066 DVCS \u306e\u5229\u7528\u3068\u7406\u89e3\u306b\u7126\u70b9\u3092\u5f53\u3066\u305f\u4e00\u9023\u306e\u30d6\u30ed\u30b0\u6295\u7a3f\u3092\u516c\u958b\u3057\u307e\u3059\u304c\u3001\u4eca\u56de\u306f\u305d\u306e\u6700\u521d\u306e\u8a18\u4e8b\u3067\u3059\u3002<\/p>\n

\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u5168\u822c\u306b\u95a2\u3059\u308b\u57fa\u672c\u7684\u306a\u4e8b\u9805\u304b\u3089\u59cb\u3081\u3001\u4e00\u822c\u7684\u306a\u5185\u5bb9\u306b\u3064\u3044\u3066\u78ba\u8a8d\u3057\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n

\u7c21\u5358\u306a\u4f8b<\/h2>\n

\u30b3\u30fc\u30c9\u306e\u7de8\u96c6\u306b\u3064\u3044\u3066\u8b70\u8ad6\u3059\u308b\u969b\u3001\u5177\u4f53\u4f8b\u304c\u3042\u308b\u3068\u308f\u304b\u308a\u3084\u3059\u304f\u306a\u308a\u307e\u3059\u3002\u305d\u3053\u3067\u3001\u7c21\u5358\u306a\u30d1\u30fc\u30bd\u30ca\u30eb Web \u30da\u30fc\u30b8\u3092\u4f7f\u7528\u3057\u3066\u307f\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27<\/div>\n<\/td>\n
\n
<h1><\/span><\/span><\/span>John Doe<\/h1><\/span><\/span><\/span>
\n&nbsp;<\/span><\/p>\n

A Java programmer from Chicago, IL.<\/p>\n

&nbsp;<\/span><\/p>\n

<header><\/span><\/span><\/span> <\/header><\/span><\/span><\/span>
\n<h2><\/span><\/span><\/span>About John<\/h2><\/span><\/span><\/span>
\n&nbsp;<\/span><\/p>\n

John is experienced in many areas of Java programming.
\n<h2><\/span><\/span><\/span>Contact Information<\/h2><\/span><\/span><\/span>
\n&nbsp;<\/span>
\n<ul><\/span><\/span><\/span>
\n<ul><\/span><\/span><\/span>
\n    <li><\/span><\/span><\/span>Email: john@example.com<\/li><\/span><\/span><\/span>
\n<\/ul><\/span><\/span><\/span>
\n<\/ul><\/span><\/span><\/span>
\n<ul><\/span><\/span><\/span>
\n    <li><\/span><\/span><\/span>Phone Number: (555) 555-1024<\/li><\/span><\/span><\/span>
\n<\/ul><\/span><\/span><\/span>
\n&nbsp;<\/span><\/p>\n

<footer><\/span><\/span><\/span>Copyright John Smith, 2010<\/footer><\/span><\/span><\/span>&nbsp;<\/span><\/p>\n

&nbsp;<\/span><\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u3053\u306e\u30b7\u30f3\u30d7\u30eb\u306a HTML \u30da\u30fc\u30b8\u3092\u4eca\u56de\u306e\u30a8\u30f3\u30c8\u30ea\u306e\u4e2d\u3067\u4f8b\u3068\u3057\u3066\u4f7f\u7528\u3057\u307e\u3059\u3002<\/p>\n

\u30b3\u30fc\u30c9\u306f\u983b\u7e41\u306b\u66f8\u304d\u63db\u3048\u3089\u308c\u308b<\/h2>\n

\u6211\u3005\u304c\u30d7\u30ed\u30b0\u30e9\u30de\u30fc\u3068\u3057\u3066\u8a18\u8ff0\u3059\u308b\u30b3\u30fc\u30c9\u306f\u983b\u7e41\u306b\u66f8\u304d\u63db\u3048\u3089\u308c\u307e\u3059\u3002\u4fee\u6b63\u3059\u3079\u304d\u30d0\u30b0\u3001\u8ffd\u52a0\u3059\u3079\u304d\u6a5f\u80fd\u3001\u305d\u3057\u3066\u5909\u66f4\u3059\u3079\u304d\u30b3\u30f3\u30c6\u30f3\u30c4\u3002<\/p>\n

\u30b3\u30fc\u30c9\u306e\u591a\u304f\u306f\u304a\u99b4\u67d3\u307f\u306e\u30d7\u30ec\u30fc\u30f3 \u30c6\u30ad\u30b9\u30c8 \u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u4fdd\u5b58\u3055\u308c\u3001\u3053\u308c\u3089\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u3067\u30b3\u30fc\u30c9\u3092\u66f8\u304d\u63db\u3048\u307e\u3059\u3002\u5909\u66f4\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3073\u306b\u3001\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u65b0\u3057\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u3082\u306e\u3067\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059\u3002<\/p>\n

\u6b8b\u5ff5\u306a\u3053\u3068\u306b\u3001\u5b8c\u74a7\u306a\u30d7\u30ed\u30b0\u30e9\u30de\u30fc\u306f\u3044\u307e\u305b\u3093\u3002\u3068\u304d\u3069\u304d\u9593\u9055\u3044\u3092\u72af\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306b\u5909\u66f4\u3092\u52a0\u3048\u3066\u4fdd\u5b58\u3057\u3001\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u3066\u4f55\u304b\u304c\u3046\u307e\u304f\u3044\u304b\u306a\u304b\u3063\u305f\u5834\u5408\u3001\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u623b\u308c\u305f\u308a\u3001\u5b9f\u969b\u306e\u5909\u66f4\u7b87\u6240\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3092\u53d6\u5f97\u3067\u304d\u308b\u3068\u4fbf\u5229\u3067\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u3069\u3053\u3067\u9593\u9055\u3063\u305f\u304b\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002<\/p>\n

\u3053\u3053\u3067\u4f8b\u3092\u6319\u3052\u3066\u307f\u307e\u3057\u3087\u3046\u3002\u67b6\u7a7a\u306e\u4eba\u7269\u3067\u3042\u308b John \u306f\u81ea\u5206\u306e \"Contact Information (\u9023\u7d61\u5148\u60c5\u5831)\" \u30d8\u30c3\u30c0\u30fc\u3092 \"John's Contact Information (John \u306e\u9023\u7d61\u5148\u60c5\u5831)\" \u3068\u66f4\u65b0\u3057\u305f\u3044\u3068\u8003\u3048\u3066\u3044\u307e\u3059\u3002\u5f7c\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3057\u3001\u8a72\u5f53\u30bb\u30af\u30b7\u30e7\u30f3\u3092\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u3057\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
2
3
4
5
6
7<\/div>\n<\/td>\n
\n
<section><\/span>
\n<h1<\/span>><\/span>John’s Contact Information<\/<\/span>h1<\/span>><\/span>
\n<ul<\/span>><\/span>
\n    <li<\/span>><\/span>Email: john@example.com<\/<\/span>li<\/span>><\/span>
\n    <li<\/span>><\/span>Phone Number: (555) 555-1024<\/<\/span>li<\/span>><\/span>
\n<\/<\/span>ul<\/span>><\/span>
\n<\/<\/span>section><\/span><\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3057\u3066\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u305f\u3068\u3053\u308d\u3067\u3001\u9593\u9055\u3044\u306b\u6c17\u4ed8\u304d\u307e\u3059\u3002John \u306f\u554f\u984c\u3092\u3069\u306e\u3088\u3046\u306b\u898b\u3064\u3051\u3089\u308c\u308b\u3067\u3057\u3087\u3046?<\/p>\n

\u4eca\u56de\u306e\u30b7\u30f3\u30d7\u30eb\u306a\u4f8b\u3067\u306f\u3001\u7d20\u76f4\u306b\u30d5\u30a1\u30a4\u30eb\u5168\u4f53\u3092\u8aad\u3093\u3067\u554f\u984c\u3092\u7279\u5b9a\u3059\u308b\u3053\u3068\u306f\u6bd4\u8f03\u7684\u7c21\u5358\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u5de8\u5927\u306a\u30d5\u30a1\u30a4\u30eb\u3067\u76f8\u4e92\u306b\u95a2\u9023\u3057\u3042\u3063\u3066\u3044\u308b\u591a\u304f\u306e\u90e8\u5206\u3092\u7de8\u96c6\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u975e\u5e38\u306b\u56f0\u96e3\u306b\u306a\u308b\u53ef\u80fd\u6027\u304c\u9ad8\u3044\u3053\u3068\u306f\u660e\u767d\u3067\u3059\u3002<\/p>\n

\u30d5\u30a1\u30a4\u30eb\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u9593\u306e\u6bd4\u8f03\u306e\u969b\u306b\u3001\u73fe\u5728\u3067\u3082\u5229\u7528\u3055\u308c\u3066\u3044\u308b\u3082\u3063\u3068\u3082\u7c21\u5358\u306a\u65b9\u6cd5\u306f\u3001\"diff (\u5dee\u5206)\" \u304a\u3088\u3073 \"patch (\u30d1\u30c3\u30c1)\" \u3068\u547c\u3070\u308c\u308b\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u306e\u7d44\u307f\u5408\u308f\u305b\u3067\u3059\u3002\u8fd1\u5e74\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u306f\u3001\u3053\u308c\u3089\u306e\u30c4\u30fc\u30eb\u306e\u6982\u5ff5 (\u305d\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u307e\u3067\u3082) \u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002\u305d\u308c\u3067\u306f\u3001\u3053\u308c\u3089\u304c\u3069\u306e\u3088\u3046\u306b\u52d5\u4f5c\u3059\u308b\u306e\u304b\u3092\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n

Diff<\/h2>\n

diff<\/a> \u306f\u5143\u3005\u306f 1970 \u5e74\u4ee3\u521d\u671f\u306b\u8003\u6848\u3055\u308c\u307e\u3057\u305f\u3002\u305d\u306e\u76ee\u7684\u306f\u30012 \u3064\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5165\u529b\u5185\u5bb9\u3068\u3057\u3066\u53d6\u308a\u8fbc\u307f\u3001\u6700\u521d\u306e\u30d5\u30a1\u30a4\u30eb\u3068 2 \u3064\u76ee\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u7b87\u6240\u3092\u793a\u3059\u30c6\u30ad\u30b9\u30c8\u306e\u584a\u3092\u51fa\u529b\u3059\u308b\u3053\u3068\u3067\u3059\u3002<\/p>\n

diff \u306b\u306f\u3055\u307e\u3056\u307e\u306a\u5f62\u5f0f\u304c\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u3053\u3053\u3067\u306f \"\u30e6\u30cb\u30d5\u30a1\u30a4\u30c9\u5f62\u5f0f diff\" \u3068\u3057\u3066\u77e5\u3089\u308c\u308b\u3082\u3063\u3068\u3082\u4e00\u822c\u7684\u306a\u5f62\u5f0f\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002\u81ea\u5b85\u3067 Linux \u3084 OS X \u4e0a\u3067\u4f5c\u696d\u3057\u3066\u3044\u308b\u5834\u5408\u3001diff \u3092\u5b9f\u884c\u3057\u3066\u3053\u306e\u5f62\u5f0f\u3092\u53d6\u5f97\u3059\u308b\u306b\u306f\u4ee5\u4e0b\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6e21\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1<\/div>\n<\/td>\n
\n
-U3<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u67b6\u7a7a\u306e\u30e6\u30fc\u30b6\u30fc John \u306f diff \u3092\u4f7f\u7528\u3057\u3066\u81ea\u5206\u306e\u5909\u66f4\u5185\u5bb9\u3092\u8996\u899a\u7684\u306b\u8868\u793a\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u305d\u306e\u524d\u306b\u3082\u3046\u5c11\u3057\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002Web \u30da\u30fc\u30b8\u306e\u5143\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u3068\u3063\u3066\u7f6e\u304f\u5fc5\u8981\u304c\u3042\u308b\u304b\u3089\u3067\u3059\u3002John \u304c\u81ea\u5206\u306e Web \u30da\u30fc\u30b8\u3092\u7de8\u96c6\u3057\u305f\u3044\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u624b\u9806\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n