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] [-U n] [-Bbiwz] [--in-place] diff1 diff2
10
11       flipdiff {[--help] [--version]}
12

DESCRIPTION

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

OPTIONS

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

LIMITATIONS

61       This is only been very lightly tested, and may not even work. Using
62       --in-place is not recommended at the moment.
63
64       There are some cases in which it is not possible to meaningfully flip
65       patches without understanding the semantics of the content. This
66       program only uses complete lines that appear at some stage during the
67       application of the two patches, and never composes a line from parts.
68
69       Because of this, it is generally a good idea to read through the output
70       to check that it makes sense.
71

AUTHOR

73       Tim Waugh <twaugh@redhat.com>.
74
75
76
77patchutils                      31 January 2003                    FLIPDIFF(1)
Impressum