1FLIPDIFF(1)                        Man pages                       FLIPDIFF(1)
2
3
4

NAME

6       flipdiff - exchange the order of two incremental patches
7

SYNOPSIS

9       flipdiff [[-p n] | [--strip-match=n]] [[-U n] | [--unified=n]]
10                [[-d PAT] | [--drop-context=PAT]] [[-q] | [--quiet]] [[-z] |
11                [--decompress]] [[-b] | [--ignore-space-change]] [[-B] |
12                [--ignore-blank-lines]] [[-i] | [--ignore-case]] [[-w] |
13                [--ignore-all-space]] [--in-place] diff1 diff2
14
15       flipdiff {[--help] | [--version]}
16

DESCRIPTION

18       flipdiff exchanges the order of two patch files that apply one after
19       the other. The patches must be “clean”: the context lines must match
20       and there should be no mis-matched offsets.
21
22       The swapped patches are sent to standard output, with a marker line
23       (“=== 8< === cut here === 8< ===”) between them, unless the --in-place
24       option is passed. In that case, the output is written back to the
25       original input files.
26

OPTIONS

28       -p n, --strip-match=n
29           When comparing filenames, ignore the first n pathname components
30           from both patches. (This is similar to the -p option to GNU
31           patch(1).)
32
33       -q, --quiet
34           Quieter output. Don´t emit rationale lines at the beginning of each
35           patch.
36
37       -U n, --unified=n
38           Attempt to display n lines of context (requires at least n lines of
39           context in both input files). (This is similar to the -U option to
40           GNU diff(1).)
41
42       -d pattern, --drop-context=PATTERN
43           Don´t display any context on files that match the shell wildcard
44           pattern. This option can be given multiple times.
45
46           Note that the interpretation of the shell wildcard pattern does not
47           count slash characters or periods as special (in other words, no
48           flags are given to fnmatch). This is so that “*/basename”-type
49           patterns can be given without limiting the number of pathname
50           components.
51
52       -i, --ignore-case
53           Consider upper- and lower-case to be the same.
54
55       -w, --ignore-all-space
56           Ignore whitespace changes in patches.
57
58       -b, --ignore-space-change
59           Ignore changes in the amount of whitespace.
60
61       -B, --ignore-blank-lines
62           Ignore changes whose lines are all blank.
63
64       -z, --decompress
65           Decompress files with extensions .gz and .bz2.
66
67       --in-place
68           Write output to the original input files.
69
70       --help
71           Display a short usage message.
72
73       --version
74           Display the version number of flipdiff.
75

LIMITATIONS

77       This is only been very lightly tested, and may not even work. Using
78       --in-place is not recommended at the moment.
79
80       There are some cases in which it is not possible to meaningfully flip
81       patches without understanding the semantics of the content. This
82       program only uses complete lines that appear at some stage during the
83       application of the two patches, and never composes a line from parts.
84
85       Because of this, it is generally a good idea to read through the output
86       to check that it makes sense.
87

AUTHOR

89       Tim Waugh <twaugh@redhat.com>
90           Package maintainer
91
92
93
94patchutils                      23 January 2009                    FLIPDIFF(1)
Impressum