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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
.\"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 "REDIFF" 1 "13 Mar 2002" "patchutils" ""
.SH NAME
rediff, editdiff \- fix offsets and counts of a hand-edited diff
.SH "SYNOPSIS"
.nf
\fBrediff\fR \fIORIGINAL\fR \fIEDITED\fR
.fi
.nf
\fBrediff\fR {--help | --version}
.fi
.SH "DESCRIPTION"
.PP
You can use rediff to correct a hand-edited unified diff. Take a copy of the diff you want to edit, and edit it without changing any offsets or counts (the lines that begin ``@@''). Then run rediff, telling it the name of the original diff file and the name of the one you have edited, and it will output the edited diff file but with corrected offsets and counts. A small script, editdiff, is provided for editing a diff file in-place.
.PP
The types of changes that are currently handled are:
.TP 3
\(bu
Modifying the text of any file content line (of course).
.TP
\(bu
Adding new line insertions or deletions.
.TP
\(bu
Adding, changing or removing context lines. Lines at the context horizon are dealt with by adjusting the offset and/or count.
.TP
\(bu
Adding or removing a single hunk (@@-prefixed section). For multiple hunks, a work-around is to ``neutralise'' the hunk by deleting lines beginning with '+' and changing '-' at the beginning of lines to '+'. That hunk can then be removed afterwards.
.LP
.SH "OPTIONS"
.TP
\fB--help\fR
Display a short usage message.
.TP
\fB--version\fR
Display the version number of rediff.
.SH "SEE ALSO"
.PP
\fBinterdiff\fR(1)
.SH AUTHOR
Tim Waugh <twaugh@redhat.com>.
|
