Previous: patch and POSIX, Up: Merging with patch [Contents][Index]
patch
¤ÈÅÁÅýŪ¤Êpatch
¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎGNU patch
¤Ï¡¤Ä̾ïPOSIX¤Îɸ½à¤Ë½¾¤¤
¤Þ¤¹¡¥¤³¤Î°ìÈÌŪ¤Êµ¬Â§¤Ø¤Î¤ï¤º¤«¤ÊÎã³°¤Ï¡¤See patch and POSIX.
»Äǰ¤Ê¤¬¤éPOSIX¤Ç¤Ï¡¤Ê£¿ô¤Î½ÅÍפÊÊýË¡¤Ç¡¤patch
¤Îưºî¤òºÆ
ÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡¥ÅÁÅýŪ¤Êpatch
¤äGNU patch
¤Î¥Ð¡¼
¥¸¥ç¥ó2.1¤È¤½¤ì°ÊÁ°¤ÇÆâÉô½èÍý¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¤°Ê²¼¤Î°ã¤¤¤òÃΤäƤª¤¯
¤Ù¤¤Ç¤¹¡¥
patch
¤Ç¤Ï¡¤-p¤Î¥ª¥Ú¥é¥ó¥É¤Ï¥ª¥×¥·¥ç¥ó¤Ç¡¤
-p¤À¤±¤À¤È-p0¤ÈÅù²Á¤Ç¤¹¡¥¸½ºß-p¥ª¥×¥·¥ç¥ó¤Ï¥ª
¥Ú¥é¥ó¥É¤òÍ׵ᤷ¡¤-p 0¤Ï¸½ºß-p0¤ÈÅù²Á¤Ç¤¹¡¥¸ß´¹À¤òºÇ
Âç¤Ë¤¹¤ë¤¿¤á¡¤-p0¤È-p1¤Î¤è¤¦¤Ê¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À
¤µ¤¤¡¥
¤Þ¤¿¡¤ÅÁÅýŪ¤Êpatch
¤Ï¡¤Á°ÃÖ¤µ¤ì¤ë¥Ñ¥¹¤ò¼è¤ê½ü¤¯¤È¤¡¤Ã±½ã¤Ë¥¹
¥é¥Ã¥·¥å¤ò¿ô¤¨¤Æ¤¤¤¤Þ¤¹¡¥patch
¤Ï¸½ºß¡¤¥Ñ¥¹Ì¾¤Î¹½À®Í×ÁǤò¿ô¤¨
¤Þ¤¹¡¥¤¹¤Ê¤ï¤Á¡¤°ì¤Ä°Ê¾å¤ÎÎÙÀܤ¹¤ë¥¹¥é¥Ã¥·¥å¤Ï¡¤¸½ºßñ°ì¤Î¥¹¥é¥Ã¥·¥å¤È¤·
¤Æ¿ô¤¨¤é¤ì¤Þ¤¹¡¥¸ß´¹À¤òºÇÂç¤Ë¤¹¤ë¤¿¤á¡¤¥Õ¥¡¥¤¥ë̾¤Ë//¤ò´Þ¤à¥Ñ¥Ã
¥Á¤òÁ÷¤ë¤Î¤ÏÈò¤±¤Æ¤¯¤À¤µ¤¤¡¥
patch
¤Ï¡¤¥Ç¥Õ¥©¥ë¥È¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬²Äǽ¤Ç¤¹¡¥¤³¤Îưºî
¤Ï¸½ºß¡¤-b¤ä--backup¥ª¥×¥·¥ç¥ó¤ÇÍøÍѲÄǽ¤Ç¤¹¡¥
È¿ÂФˡ¤POSIX¤Îpatch
¤Ç¤Ï¡¤¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ï°ìÃפ·¤Ê¤¤¤â¤Î¤¬
¤¢¤ë¤È¤¤Ç¤â·è¤·¤ÆºîÀ®¤µ¤ì¤Þ¤»¤ó¡¥GNU patch
¤Ç¤Ï¡¤¤³¤Îưºî
¤Ï--no-backup-if-mismatch¥ª¥×¥·¥ç¥ó¤ä¡¤POSIX½àµò¤Ë¤¹¤ë¤³¤È
¤ÇÍøÍѲÄǽ¤Ç¤¹¡¥
ÅÁÅýŪ¤Êpatch
¤Î-b suffix¥ª¥×¥·¥ç¥ó¤Ï¡¤GNU
patch
¤Î‘-b -z suffix’¥ª¥×¥·¥ç¥ó¤ÈÅù²Á¤Ç¤¹¡¥
patch
¤Ï¡¤¥Ñ¥Ã¥Á¥Ø¥Ã¥À¤«¤é¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥Õ¥¡¥¤¥ë̾¤òľ
´Ñ¤¹¤ë¤¿¤á¤Ë¡¤Ê£»¨¤Ê(¤½¤·¤Æ¥É¥¥å¥á¥ó¥È¤¬ÉÔ´°Á´¤Ê)¼êË¡¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤·¤¿¡¥
¤³¤Î¼êË¡¤Ï¡¤POSIX¤Ë½àµò¤·¤Æ¤ª¤é¤º¡¤¤ï¤º¤«¤Ëgotcha¤â¤¢¤ê¤Þ¤¹¡¥¸½ºß
patch
¤Ï¡¤Ê̤ÎÊ£»¨¤Ê(¤·¤«¤·¥É¥¥å¥á¥ó¥È¤¬¤è¤êÎɤ¤)¡¤¥ª¥×¥·¥ç¥ó
¤ÇPOSIX¤Ë½àµò¤·¤Æ¤¤¤ë¼êË¡¤ò»ÈÍѤ·¤Æ¤Þ¤¹¡¥¤è¤êgotcha¤¬¾¯¤Ê¤¤¤³¤È¤ò´ü
ÂÔ¤·¤Æ¤¤¤Þ¤¹¡¥¤½¤ÎÆó¤Ä¤Î¼êË¡¤Ï¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤¬¥Õ¥¡¥¤¥ë
̾¤Ç¡¤‘Index:’¹Ô¤¬Á°ÃÖʪ¤ò¼è¤ê½ü¤¤¤¿¸å¤Ç¤â¤¹¤Ù¤Æ¼±Ê̤Ǥ¤ë¾ì¹ç¡¤¸ß
´¹À¤¬¤¢¤ê¤Þ¤¹¡¥¥Ø¥Ã¥À¤Î¥Õ¥¡¥¤¥ë̾¤¬Æ±¤¸¿ô¤Î¥¹¥é¥Ã¥·¥å¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¡¤
Ä̾ï¤Ï¥Ñ¥Ã¥Á¤Ë¸ß´¹À¤¬¤¢¤ê¤Þ¤¹¡¥
patch
¤Ï¥æ¡¼¥¶¤Ë¼ÁÌ䤹¤ë¤È¤¡¤É¸½à¥¨¥é¡¼½ÐÎϤ˼ÁÌä¤òÁ÷
¤ê¡¤Ã¼Ëö¤È¤Ê¤Ã¤Æ¤¤¤ë°Ê²¼¤Î¥ê¥¹¥È¤ÎºÇ½é¤Î¥Õ¥¡¥¤¥ë¤«¤éÅú¤òõ¤·¤Þ¤¹¡¥É¸½à¥¨
¥é¡¼½ÐÎÏ¡¤É¸½à½ÐÎÏ¡¤/dev/tty¡¤¤½¤·¤ÆÉ¸½àÆþÎϤǤ¹¡¥¸½ºß
patch
¤Ï¡¤É¸½à½ÐÎϤ˼ÁÌä¤òÁ÷¤ê¡¤Åú¤ò/dev/tty¤«¤é¼õ¤±¤È¤ê
¤Þ¤¹¡¥¼ÁÌä¤ËÂФ¹¤ë¥Ç¥Õ¥©¥ë¥È¤Ï¡¤¥Ç¥Õ¥©¥ë¥È¤ÎÅú¤¨¤ò»ÈÍѤ¹¤ë¤È¤
patch
¤¬Ìµ¸Â¥ë¡¼¥×¤Ë¤Ê¤é¤Ê¤¤¤è¤¦¤ËÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
patch
¤Ï¡¤°¤¤hunk¤Î¿ô¤ò¿ô¤¨¤¿¥¹¥Æ¡¼¥¿¥¹Ãͤ䡤ËÜÅö¤ËÌä
Â꤬¤¢¤Ã¤¿¤È¤1¤Ë¤Ê¤ë¥¹¥Æ¡¼¥¿¥¹¤Ç½ªÎ»¤·¤Æ¤¤¤Þ¤·¤¿¡¥¸½ºßpatch
¤Ï¡¤
hunk¤Ë¼ºÇÔ¤·¤¿¤â¤Î¤¬¤¢¤ë¾ì¹ç¤Ï1¤Î¥¹¥Æ¡¼¥¿¥¹¡¤ËÜÅö¤ËÌäÂ꤬¤¢¤Ã¤¿¤È¤¤Ï2¤Î
¥¹¥Æ¡¼¥¿¥¹¤Ç½ªÎ»¤·¤Þ¤¹¡¥
patch
¡¤ÅÁÅýŪ¤Êpatch
¡¤¤Þ¤¿¤Ï¡¤POSIX½à
µò¤Îpatch
¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¿Í¤Ë¼Â¹ÔÊýË¡¤òÀâÌÀ¤¹¤ë¤È¤¡¤°Ê²¼¤Î¥ª¥×
¥·¥ç¥ó¤ËÀ©¸Â¤·¤Æ¤¯¤À¤µ¤¤¡¥°Ê²¼¤Î¥ê¥¹¥È¤Î¥¹¥Ú¡¼¥¹¤Ï½ÅÍפǡ¤¥ª¥Ú¥é¥ó¥É¤Ïɬ
ÍפǤ¹¡¥
-c -d dir -D define -e -l -n -N -o outfile -pnum -R -r rejectfile