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
|
.\"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 "FLIPDIFF" 1 "31 January 2003" "patchutils" ""
.SH NAME
flipdiff \- exchange the order of two incremental patches
.SH "SYNOPSIS"
.ad l
.hy 0
.HP 9
\fBflipdiff\fR [\-p\ \fIn\fR] [\-U\ \fIn\fR] [\-Bbiwz] [\-\-in\-place] \fIdiff1\fR \fIdiff2\fR
.ad
.hy
.ad l
.hy 0
.HP 9
\fBflipdiff\fR {\fB\-\-help\fR | \fB\-\-version\fR}
.ad
.hy
.SH "DESCRIPTION"
.PP
\fBflipdiff\fR exchanges the order of two patch files that apply one after the other\&. The patches must be ``clean'': the context lines must match and there should be no mis\-matched offsets\&.
.PP
The swapped patches are sent to standard output, with a marker line (``===\~8<\~===\~cut\~here\~===\~8<\~==='') between them, unless the \fB\-\-in\-place\fR option is passed\&. In that case, the output is written back to the original input files\&.
.SH "OPTIONS"
.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\-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\-\-in\-place\fR
Write output to the original input files\&.
.TP
\fB\-\-help\fR
Display a short usage message\&.
.TP
\fB\-\-version\fR
Display the version number of flipdiff\&.
.SH "LIMITATIONS"
.PP
This is only been very lightly tested, and may not even work\&. Using \fB\-\-in\-place\fR is not recommended at the moment\&.
.PP
There are some cases in which it is not possible to meaningfully flip patches without understanding the semantics of the content\&. This program only uses complete lines that appear at some stage during the application of the two patches, and never composes a line from parts\&.
.PP
Because of this, it is generally a good idea to read through the output to check that it makes sense\&.
.SH AUTHOR
Tim Waugh <twaugh@redhat\&.com>.
|
