.\"	$Id: patch.1,v 1.2 1993/08/02 17:55:18 mycroft Exp $	-*- nroff -*-
.rn '' }`
.de Sh
.br
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp
.if t .sp .5v
.if n .sp
..
'\"
'\"     Set up \*(-- to give an unbreakable dash;
'\"     string Tr holds user defined translation string.
'\"     Bell System Logo is used as a dummy character.
'\"
'\" Shut up a groff -ww warning.
.if \n(.g .if !dTr .ds Tr
.ie n \{\
.tr \(*W-\*(Tr
.ds -- \(*W-
.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
.ds L" ""
.ds R" ""
.ds L' '
.ds R' '
'br \}
.el \{\
.ds -- \(em\|
.tr \*(Tr
.ds L" ``
.ds R" ''
.ds L' `
.ds R' '
'br\}
.TH PATCH 1
.SH ̾
patch - diff ե򥪥ꥸʥΥեŬѤ
.SH 
.B patch
[options] [origfile [patchfile]] [+ [options] [origfile]]...
.sp
ǤƤϰʲΤ褦ˤޤ
.sp
.B patch
<patchfile
.SH 
.I patch
ϡ
.I diff
ץˤä줿ʬޤѥåե
դꥸʥեˤκʬƤơѥåѤߤΥС
ޤ
ѥåե뤬ά뤫`-'ꤵ줿ϡɸϤѥ
դޤäơ̤ϡñˡ
.sp
       patch <patchfile
.sp
ȤǼ¹Ԥޤ

ǥեưǤϡꥸʥ \*(L".orig\*(R" γĥ
(Ĺե̾򰷤ʤƥǤ \*(L"~\*(R")
դƥХååפȤƻĤǡ
ꥸʥեϡѥåѤߤΥС֤ޤץ
ˤäƥꥸʥХååפĥҤѹǤޤޤĶ
ѿ
.B SIMPLE_BACKUP_SUFFIX
ˤäơĥҤʸꤹ뤳ȤǤޤ
.PP
⤷Хååץե뤬¸ߤƤϡХåå
ե̾Ȥơե̾ΤǺǽ˽ФƤѾʸʬ
ʸؤΤȤޤѾʸʬʤäϡե̾
κǽ 1 ʸΤȤޤ
.PP
.B -o
ץǽϤꤷ⡢⤷˴Ʊե̾
ե뤬¸ߤƤ顢Ҥε§˽äơޤХååפ
ޤ
.PP
.I patch
ǽ˹ԤȤϡʬ󤬤ɤʷȽ̤뤳ȤǤϡץ
.BR -c ,
.BR -e ,
.BR -n ,
.B -u
ʤɤˤäƷꤹ뤳ȤǤޤ

context diff (ˤϤˡold-style, new-style, unified)
ӡnormal diff 
.I patch
ˤѥåƤޤ
ed diff
äϡ
.I patchñ˥ǥ
.I ed
˥ѥåեѥפ̤ϤǤ
.PP
.I patch
ϡʬ˴ޤޤ르ߤ䡢˴ޤޤ르ߤϲǽʸ¤ꥹ
åפ褦ˤʤäƤޤΤᡢ
diff ʬä
ƥåʤɤ⡢ʬʬڤФȤä
ȤʤΤޤޡ
.I patch
Ϳ뤳ȤǤޤޤʬʬ
פ뤿ᡢʲ (ǥ) 뤳Ȥ⡢ʲ
ѤäꤷʤСդǤޤ
.PP
context diff ϡnormal diff ١ʬ˴ޤޤΤ¿
ͥ (äƤʬǤʤΰʬʬޤޤ patch Ǥϡ
 hunk ȸƤ) ǡʬ
ιֹ椬ɤФʬΰʬޤ᤿
ʬƤʤ褦ʥѥåõޤ

⤷򸫤Ĥ뤳ȤǤʤäϡʬκʬ
 hunk ñ̤ǥꥸȥե˽Ϥޤ쥸ȥեϡ̾
Ϥ٤ե \*(L".rej\*(R" γĥ
(Ĺե̾򰷤ʤƥǤ \*(L"#\*(R")
դΤˤʤޤΥꥸȥե˽Ϥ
κʬդƤֹϡΥѥåեΤ
ȰäΤˤʤäƤǽ⤢ޤΤΤϾŪˤ
ᤤ֤ˤʤäƤȻפֹˤʤޤ
.PP
.I patch
ϡѥåοʹԾhunkñ̤ succeeded ⤷ failed
Ȥ𤷤ޤ
.PP
⤷ꥸʥե뤬ޥɥ饤ǻꤵʤä硢
.I patch
ϡǥåȤ٤ե̾򡢺ʬղäƤ르ߤ
鸫Ĥ褦Ȥޤcontext diff Υإåξ硢ե̾ϡ
\*(L"***\*(R" ⤷ \*(L"---\*(R" ǻϤޤԤõޤ
context diffˤϡΤ褦
ʹԤޤ󤬡⤷\*(L"Index:\*(R" Ԥä顢
ե
̾ȤȤߤޤ⤷ե̾򸫤Ĥ뤳ȤǤʤ
ϡѥå٤ե̾Ϥ褦ޤ
.PP
⤷ꥸʥե뤬Ĥʤ꡼ɥ꡼Ǥ뤱ɤ⡢
SCCS  RCS ե뤢ä硢
.I patch
ϡSCCS ΥåȤ⤷ RCS ΥåȤߤޤ
.PP
äơ⤷ʬΥߤˡ\*(L"Prereq: \*(R" ȤԤޤޤ
顢
.I patch
ϡιԤɬ׾ (̾ϥСֹ) 񤤤ƤΤȤ
ʤƺǽ word ꥸʥեƱ word 뤫
Ĵ٤ޤ⤷ word ȯǤʤС
.I patch
Ͻ¹ԤƤ褤ǧ褦ˤʤޤ
.PP
.\" XXX ϰ̣
.\"       The  upshot of all this is that you should be able to say,
.\"
 news ꡼Ǥϥѥåޤˤơ
.Sp
	| patch -d /usr/src/local/blurfl
.Sp
Τ褦˻ؼ뤳Ȥǡǥ쥯ȥ blurfl ˤե˥ѥå
Ƥ뤳ȤǤޤ
.PP
ѥåեˡ1 İʾΥѥåޤޤƤ硢
.I patch
ϡơ
̡ΥѥåեǤΤȻפäƽ¹Ԥޤξ硢ѥ
Ƥ٤ꥸʥեϡޤ褦ˡơκʬ
椫ФǤȲꤷƤޤ¾ˡ\*(L'+\*(R' ǷҤƥե̾
¤٤뤳Ȥǡ2 ܰʹߤΥե̾ꤹ뤳ȤǤޤ
(ξǤ⡢ѥåƤοե̾ϻꤹ뤳ȤϤǤ
ޤ)
.PP
.I patch
ˤϼΤ褦ʥץ󤬤ޤ
.TP 5
.BI  \-b extension
ꥸʥХååפե̾դĥҤ
extension ǻꤷޤ
.TP 5
.BI \-B prefix
ꥸʥХååפե̾դ뵭
 prefix ǻꤷޤλ򤹤ȡ
.B \-b
λ̵뤵ޤ
.TP 5
.B \-c
ʬ context diff ǤΤȤߤʤޤ
.TP 5
.B \-e
ʬ ed script ǤΤȤߤʤޤ
.TP 5
.B \-n
ʬ normal diff ǤΤȤߤʤޤ
.TP 5
.B \-u
ʬ context diff  unidiff ǤΤȤߤʤޤ
.TP 5
.BI \-d directory
ˡdirectory ǻꤷǥ쥯ȥ˰ưޤ
.TP 5
.BI \-D symbol
symbol ǻꤷܥޤϡѥåե
ˡC ΥץץåΤ褦ˡ
"#ifdef...#endif" ȤäʸѰդơܥˤ
ƺʬڤؤ˻ѤǤޤ
ʤC ХλȰۤʤꡢ
.B \-D

symbolδ֤ˤ϶򤬤ʤФʤޤ
.TP 5
.B \-E
ѥå塢ΥեϺ褦ˤޤ
.TP 5
.B \-f
桼򤷤Ƥ뤫Τ򤷤ƤΤ
ߤʤơ
.I patch
ϲҤͤΤ褦˲ꤷƽʤޤ
.sp
ѥå٤ꥸʥե븫Ĥ뤳ȤǤʤ
ϥåפޤ
.sp
``Prereq:'' ΥСʤƤ⡢ѥå
Ԥޤ
.sp
ѥåѤߤȻפƤ⡢СѥåǤϤʤȲ
ޤ
.sp
ʤΥץϡ
.I patch
ɽåߤ
ޤ󡣥åߤˤϡ
.B \-s
Ȥޤ
.TP 5
.B \-t
.BR \-f
ƱͤǤΤ褦˲ꤷޤ
.sp
ѥå٤ꥸʥե븫Ĥ뤳ȤǤʤ
ϥåפޤ(
.BR \-f
Ʊ)
.sp
``Prereq:'' ΥСʤϡåפޤ
.sp
ѥåѤߤȻפϡСѥåȲꤷޤ
.TP 5
.BI \-F number
context diff Ǻʬιֹ椬ʤ
Ĵ٤եꤷޤǥեȤ 2 ǡ
ϡcontext diff ΰ׹ԤιԿ (̾3) ¿
ʤǤ
.TP 5
.B \-l
ѥޥåξˤ֤Ӷ˴ؤ㤤̵뤷ޤ
.TP 5
.B \-N
Сѥå⤷ϡǤ˥ѥåѤߤǤȻפ
ˤϡåפޤ
.TP 5
.BI \-o out_file
ѥåƤϥե out_file Ȥޤ
.TP 5
.BI \-p number
.I patch
ѥåե뤫ȯѥ̾򸵤ˡºݤ
ե򰷤ˡѥ̾Ƭѥ
number ǻꤷޤѥå٤ե뤬ʣΥǥ
ȥˤޤäƤꡢѥåեäͤδĶȡ
ʬδĶۤʤäƤͭǤ
㤨С
.I patch
ĤƤѥ̾
.sp
	/u/howard/src/blurfl/blurfl.c
.sp
Ǥä硢
.B \-p
򲿤ꤷʤäϡǥ쥯ȥʬʤǺǸΥե̾ʬ
blurfl.c Ȥʤޤ
.B \-p1
Ȼꤷ硢ǽΥѥ̾ʬ
.sp
	u/howard/src/blurfl/blurfl.c
.sp
Ȥưޤ
.B \-p4
ʤ顢
.sp
	blurfl/blurfl.c
.sp
Ȥʤޤ
.B \-p
⤷
.B \-p0
ʤ顢Τޤޡ
.sp
	/u/howard/src/blurfl/blurfl.c
.sp
Ȥѥ̾Ȥޤ
.TP 5
.BI \-r rej_file
ꥸȥե̾Ȥ rej_file ꤷޤ
.TP 5
.B \-R
Ťեȿեְ㤨ƺʬä
ޤäΥѥåե (СѥåȸƤ) 
ŬѤޤed script Ͼ󤬾ʲ᤮
ǻȤޤ
.sp
.I patch
ϡѥåեκʬκǽ hunk Υѥå
˼Ԥ硢СѥåŬѤǤ뤫Ĵ٤ޤ
ơ⤷СѥåǤ褦ʤ顢桼
ˡ
.B \-R
ץ򥻥åȤɤҤͤޤ
СѥåǤʤ褦ʤ顢åפơ̾
ѥå³ޤ
.TP 5
.B \-s
顼ʳΥåɽʤ褦ˤޤ
.TP 5
.B \-S
ѥåե뤫θߤκʬ˴ؤѥå
̵뤹褦ˤޤ
㤨СΤ褦˻ꤷ硢
.sp
	patch -S + -S + <patchfile
.sp
ǽ 2 ܤΥե˴ؤ뺹ʬ̵뤷ޤ
3 ܤΥեˤϥѥåƤޤ
.TP 5
.B \-v
ӥإåȥѥå٥ɽޤ
.SH 
Larry Wall <lwall@netlabs.com>
.br
ӡ¾¿ι׸Ԥ
.SH Ķѿ
.TP
.B TMPDIR
ƥݥե֤ǥ쥯ȥꡣǥեȤǤϡ/tmp
.TP
.B SIMPLE_BACKUP_SUFFIX
ХååץեդĥҤꤹ롣ǥեȤǤϡ
\*(L".orig\*(R" ⤷
\*(L"~\*(R"
.SH Ϣե
$TMPDIR/patch*
.SH Ϣ
diff(1)
.SH 
å \*(L"Hmm...\*(R" ϡѥåե˺ʬǤʤ
.I patch
åפƤƥȤ뤳Ȥ򼨤ޤ
.PP
ꥸȥե뤬줿ˤϡ0 Ǥʤ֤ͤޤ
.SH 
ѥåϡѥå褦˽ޤɬʤ
ڤǤΤϡѥåեäΤƱСΥե
ФƥѥåŬѤǤ