Next: , Previous: Revision Control, Up: Merging with patch   [Contents][Index]


10.3 ÉÔ´°Á´¤Ê¥Ñ¥Ã¥Á¤ÎŬÍÑ

patch¤Ï¡¤¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ËÁ°ÃÖ¤µ¤ì¤ë¥Æ¥­¥¹¥È¤òÆÉ¤ßÈô¤Ð¤·¡¤º¹Ê¬ ¤òŬÍѤ·¡¤¤½¤·¤Æ¸åÃÖ¤µ¤ì¤ë¥Æ¥­¥¹¥È¤òÆÉ¤ßÈô¤Ð¤½¤¦¤È¤·¤Þ¤¹¡¥¤³¤Î¤¿¤á¡¤¥á¡¼ ¥ë¤Î¥á¥Ã¥»¡¼¥¸¤òľÀÜpatch¤ËÍ¿¤¨¤ë¤³¤È¤¬²Äǽ¤Ç¡¤¤½¤ì¤Ï¤¦¤Þ¤¯Æ° ºî¤¹¤ë¤Ç¤·¤ç¤¦¡¥º¹Ê¬Á´ÂΤ¬¶õÇò¤Î¸ÇÄêÎ̤Ȼפï¤ì¤ë¾ì¹ç¡¤patch¤Ï ¼«Æ°Åª¤Ë»ú²¼¤²¤ò̵»ë¤·¤Þ¤¹¡¥Á°¸å¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¤½¤ì¤¾¤ì¤Î¹Ô¤Ë²þ¹Ô¤¬ ¸åÃÖ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤patch¤Ï¼«Æ°Åª¤Ë²þ¹Ô¤ò̵»ë¤·¤Þ¤¹¡¥Á°¸å¤Îʸ ¤ò»ÈÍѤ·¤¿º¹Ê¬¤¬¡¤Internet RFC 934¤Ë¤è¤Ã¤Æ¡¤‘-’¤Ç»Ï¤Þ¤ë¹Ô¤Ë‘- ¤òÁ°ÃÖ¤¹¤ë¤³¤È¤Ç¥«¥× ¥»¥ë²½¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤patch¤Ï¼«Æ°Åª¤ËÆþÎϤΥ«¥×¥»¥ë²½¤ò³°¤·¤Þ ¤¹¡¥

¤·¤«¤·¡¤Â¾¤Î·Á¼°¤ÎÉÔ´°Á´¤ÊÆþÎϤǤϡ¤¥æ¡¼¥¶¤¬²ðÆþ¤·¤¿¤ê¥Æ¥¹¥È¤·¤¿¤ê¤¹¤ëɬ Íפ¬¤¢¤ê¤Þ¤¹¡¥