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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
.\"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 "INTERDIFF" 1 "14 May 2004" "patchutils" ""
.SH NAME
interdiff \- show differences between two diff files
.SH "SYNOPSIS"
.ad l
.hy 0
.HP 10
\fBinterdiff\fR [\-p\ \fIn\fR] [\-U\ \fIn\fR] [\-d\ \fIPAT\fR] [\-Bbiqwz] [\fB\-\-interpolate\fR | \fB\-\-combine\fR | \fB\-\-flip\fR] [\-\-no\-revert\-omitted] \fIdiff1\fR \fIdiff2\fR
.ad
.hy
.ad l
.hy 0
.HP 10
\fBinterdiff\fR {\fB\-\-help\fR | \fB\-\-version\fR}
.ad
.hy
.SH "DESCRIPTION"
.PP
\fBinterdiff\fR creates a unified format diff that expresses the difference between two diffs\&. The diffs must both be relative to the same files\&. For best results, the diffs must have at least three lines of context\&.
.PP
To reverse a patch, use \fI/dev/null\fR for \fIdiff2\fR\&.
.PP
To reduce the amount of context in a patch, use:
.IP
interdiff \-U1 /dev/null patchfile
.PP
Since \fBinterdiff\fR doesn't have the advantage of being able to look at the files that are to be modified, it has stricter requirements on the input format than \fBpatch\fR(1) does\&. The output of GNU diff will be okay, even with extensions, but if you intend to use a hand\-edited patch it might be wise to clean up the offsets and counts using \fBrecountdiff\fR(1) first\&.
.PP
Note, however, that the two patches must both be relative to the versions of the same original set of files\&.
.PP
The diffs may be in context format\&. The output, however, will be in unified format\&.
.SH "OPTIONS"
.TP
\fB\-h\fR
Ignored, for compatibility with older versions of interdiff\&. This option will go away soon\&.
.TP
\fB\-p\fR \fIn\fR
When comparing filenames, ignore the first \fIn\fR pathname components from both patches\&. (This is similar to the \fB\-p\fR option to GNU \fBpatch\fR(1)\&.)
.TP
\fB\-q\fR
Quieter output\&. Don't emit rationale lines at the beginning of each patch\&.
.TP
\fB\-U\fR \fIn\fR
Attempt to display \fIn\fR lines of context (requires at least \fIn\fR lines of context in both input files)\&. (This is similar to the \fB\-U\fR option to GNU \fBdiff\fR(1)\&.)
.TP
\fB\-d\fR \fIpattern\fR
Don't display any context on files that match the shell wildcard \fIpattern\fR\&. This option can be given multiple times\&.
Note that the interpretation of the shell wildcard pattern does not count slash characters or periods as special (in other words, no flags are given to \fBfnmatch\fR)\&. This is so that ``*/basename''\-type patterns can be given without limiting the number of pathname components\&.
.TP
\fB\-i\fR
Consider upper\- and lower\-case to be the same\&.
.TP
\fB\-w\fR
Ignore whitespace changes in patches\&.
.TP
\fB\-b\fR
Ignore changes in the amount of whitespace\&.
.TP
\fB\-B\fR
Ignore changes whose lines are all blank\&.
.TP
\fB\-z\fR
Decompress files with extensions \&.gz and \&.bz2\&.
.TP
\fB\-\-interpolate\fR
Run as ``interdiff''\&. This is the default\&.
.TP
\fB\-\-combine\fR
Run as ``combinediff''\&. See \fBcombinediff\fR(1) for more information about how the behaviour is altered in this mode\&.
.TP
\fB\-\-no\-revert\-omitted\fR
(For interpolation mode only) When a file is changed by the first patch but not by the second, don't revert that change\&.
.TP
\fB\-\-help\fR
Display a short usage message\&.
.TP
\fB\-\-version\fR
Display the version number of interdiff\&.
.SH "EXAMPLES"
.PP
Basic usage:
.IP
interdiff \-z 3\&.2pre1\&.patch\&.gz 3\&.2pre2\&.patch\&.gz
.PP
Reversing a patch:
.IP
interdiff patch /dev/null
.PP
Reversing part of a patch (and ignoring the rest):
.IP
filterdiff \-i file\&.c patchfile | \\
interdiff /dev/stdin /dev/null
.SH "BUGS"
.PP
There are currently no known bugs in interdiff; but there are some caveats\&. If you find a bug, please report it (along with a minimal test case) to Tim Waugh <twaugh@redhat\&.com>\&.
.PP
There are some sets of patches in which there is just not enough information to produce a proper interdiff\&. In this case, the strategy employed is to revert the original patch and apply the new patch\&. This, unfortunately, means that interdiffs are not guaranteed to be reversible\&.
.SH "SEE ALSO"
.PP
\fBcombinediff\fR(1)
.SH AUTHOR
Tim Waugh <twaugh@redhat\&.com>.
.br
Man page edited by Michael K\&. Johnson <johnsonm@redhat\&.com>.
|
