Next: Reject Names, Previous: Backups, Up: Merging with patch [Contents][Index]
Ä̾patch
¤Ï¡¤¥ª¥ê¥¸¥Ê¥ë¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ò¡¤¤½¤Î̾Á°¤Ë³ÈÄ¥»Ò
‘.orig’¤ä¡¤‘.orig’¤¬¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤È¤·¤ÆÄ¹²á¤®¤ë¾ì¹ç¤Ï
‘~’¤ò¸åÃÖ¤·¤¿¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë̾Á°¤òÊѤ¨¤Þ¤¹¡¥
1
-z backup-suffix¤ä--suffix=backup-suffix¥ª
¥×¥·¥ç¥ó¤Ç¡¤Âå¤ï¤ê¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×ÍѳÈÄ¥»Ò¤È¤·¤Æpatch
¤Ï
backup-suffix¤ò»ÈÍѤ·¤Þ¤¹¡¥
¤Þ¤¿¡¤SIMPLE_BACKUP_SUFFIX
´Ä¶ÊÑ¿ô¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò
»ØÄꤹ¤ë¤³¤È¤â²Äǽ¤Ç¤¹¤¬¡¤¥ª¥×¥·¥ç¥ó¤¬Í¥À褵¤ì¤Þ¤¹¡¥
patch
¤Ç¤Ï¡¤GNU Emacs¤Î¤è¤¦¤ËÈÖ¹æÉդΥХ寥¢¥Ã¥×¥Õ¥¡¥¤¥ë
¤òºîÀ®¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥¤³¤Î¼êË¡¤òÍѤ¤¤ë¤³¤È¤Ç¡¤¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤ËÂÐ
¤·¤ÆÃ±°ì¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ý¤ÄÂå¤ï¤ê¤Ë¡¤patch
¤Ç¥Õ¥¡¥¤¥ë
¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¤¿¤Ó¤Ë¿·¤·¤¤¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡¥Î㤨¤Ð¡¤
sink¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ï¡¤Ï¢Â³Åª¤Ë¡¤
sink.~1~¡¤sink.~2~¡¤sink.~3~Åù¤Ë¤Ê¤ê¤Þ¤¹¡¥
-V backup-style¤ä
--version-control=backup-style¥ª¥×¥·¥ç¥ó¤Ï¡¤¥Ð¥Ã¥¯¥¢¥Ã¥×
¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¼êË¡¤ò°ú¿ô¤È¤·¤Æ¼õ¤±Æþ¤ì¤Þ¤¹¡¥patch
¤¬
PATCH_VERSION_CONTROL
´Ä¶ÊÑ¿ô¤òÍѤ¤¤ÆºîÀ®¤¹¤ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤Î·Á¼°¤ò
À©¸æ¤¹¤ë¤³¤È¤â²Äǽ¤Ç¡¤-V¥ª¥×¥·¥ç¥ó¤ÇÍ¥À褷¤Þ¤¹¡¥
PATCH_VERSION_CONTROL
¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¤VERSION_CONTROL
´Ä¶ÊÑ¿ô¤¬Âå¤ï¤ê¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡¥¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤äÊÑ¿ô¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡
¥¤¥ë¤Î̾Á°¤òÀ©¸æ¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥¥ê¥Ó¥¸¥ç¥ó¥³¥ó¥È¥í¡¼¥ë¥·¥¹¥Æ
¥à¤ÎÁªÂò¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó(see Revision Control)¡¥
´Ä¶ÊÑ¿ô¤È-V¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤ÎÃͤϡ¤GNU Emacs¤Î
version-control
ÊÑ¿ô¤Ë»÷¤Æ¤¤¤Þ¤¹(Emacs¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¥Ð¡¼¥¸¥ç¥ó¤Î¾Ü
ºÙ¤Ï¡¤see Backup Names in The GNU Emacs Manual)¡¥¤½¤ì
¤é¤Ï¡¤¤è¤êµ½ÒŪ¤ÊƱµÁ¸ì¤âǧ¼±¤·¤Þ¤¹¡¥Í¸ú¤ÊÃͤϰʲ¼¤Ë¥ê¥¹¥È¥¢¥Ã¥×¤·¤Æ¤¤
¤Þ¤¹¡¥°ì°Õ¤Ëµá¤Þ¤ë¾Êά¤â¼õ¤±Æþ¤ì¤Þ¤¹¡¥
¾ï¤ËÈÖ¹æÉդΥХ寥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡¥
´û¤Ë¸ºß¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ÎÈÖ¹æÉդΥХ寥¢¥Ã¥×¤òºîÀ®¤·¡¤¤½¤ì°Ê³°¤Ç¤Ïñ½ã ¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤·¤Þ¤¹¡¥¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡¥
¾ï¤Ëñ½ã¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤·¤Þ¤¹¡¥
patch
¤Ë¡¤¥Ç¥£¥ì¥¯¥È¥ê̾¤Î¤è¤¦¤ÊÀÜÆ¬¼¤òÉÕ¤±¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡
¥¤¥ë¤òºîÀ®¤¹¤ë¤ë¤è¤¦¤ËÅÁ¤¨¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥-B prefix¤ä
--prefix=prefix¥ª¥×¥·¥ç¥ó¤Ç¡¤prefix¤òÁ°ÃÖ¤·¤¿¥Ð¥Ã¥¯
¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡¥-Y prefix¤ä
--basename-prefix=prefix¤Ç¡¤¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë̾¤Î¥Õ¥¡
¥¤¥ë̾¤Î¹½À®Í×ÁǤκǸå¤Ë¡¤¤½¤ÎÂå¤ï¤ê¤Ëprefix¤òÁ°ÃÖ¤·¤Þ¤¹¡¥Î㤨¤Ð¡¤
-Y ~¤Çdir/file.c¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ï
dir/~file.c¤Ë¤Ê¤ê¤Þ¤¹¡¥¤³¤ì¤é¤ÎÀÜÆ¬¼¥ª¥×¥·¥ç¥ó¤Î°ì¤Ä¤ò»ÈÍѤ·¤¿¾ì
¹ç¡¤ÀÜÈø»Ò¤ò¥Ù¡¼¥¹¤Ë¤·¤¿¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡¥
½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò-o¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤹ¤ë¾ì¹ç¡¤¤½¤Î¥Õ¥¡¥¤¥ë¤Ï¥Ð¥Ã¥¯ ¥¢¥Ã¥×¤µ¤ì¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¤ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥
¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë±Æ¶Á¤¹¤ë¥ª¥×¥·¥ç¥ó¤Ï¡¤¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤¹¤ë ¤«¤É¤¦¤«¤Ë±Æ¶Á¤·¤Þ¤»¤ó¡¥Î㤨¤Ð¡¤--no-backup-if-mismatch¥ª¥×¥·¥ç ¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬ºîÀ®¤µ¤ì¤Ê¤¤¤Î¤Ç¡¤¤³¤Î¥»¥¯¥·¥ç¥ó¤Çµ½Ò¤µ ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ÏÁ´¤¯±Æ¶Á¤·¤Þ¤»¤ó¡¥
GNU patch
¤Î¥Ð¡¼¥¸¥ç¥ó2.5.4¤Ç¤Î¥³¡¼¥Ç¥£¥ó¥°¥¨¥é¡¼
¤Ç¡¤¾ï¤Ë‘~’¤¬»ÈÍѤµ¤ì¤Þ¤¹¤¬¡¤¼¡¤Î¥ê¥ê¡¼¥¹¤Ç½¤Àµ¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡¥