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
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
.\"Generated by db2man.xsl. Don't modify this, modify the source.
.de Sh \" Subsection
.br
.if t .Sp
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.de Ip \" List item
.br
.ie \\n(.$>=3 .ne \\$3
.el .ne 3
.IP "\\$1" \\$2
..
.TH "FIXCVSDIFF" 1 "7 Dec 2001" "patchutils" ""
.SH NAME
fixcvsdiff \- fix problematic diff files
.SH "SYNOPSIS"
.nf
\fBfixcvsdiff\fR [-p] [-b] [\fIfile\fR...]
.fi
.SH "DESCRIPTION"
.PP
fixcvsdiff modifies diff files created from the \fBcvs diff\fR command, where files have been added or removed. CVS tends to create diff files that \fBpatch\fR(1)mis-interprets. The diff file must retain the lines beginning with ``Index:'' in order for the correction to work.
.SH "OPTIONS"
.TP
\fB-b\fR
Keep a .bak backup file.
.TP
\fB-p\fR
Print out the \fBcvs add\fR and \fBcvs remove\fR commands that must be made after applying the diff, but before running \fBcvs commit\fR.
.SH "SEE ALSO"
.PP
\fBdiff\fR(1), \fBpatch\fR(1), \fBcvs\fR(1)
.SH AUTHORS
Amir Karger <karger@post.harvard.edu>, John Levon <moz@compsoc.man.ac.uk>.
.br
Man page edited by John Levon <moz@compsoc.man.ac.uk>.
|
