flipdiff

exchange the order of two incremental patches

Synopsis

flipdiff {[--help] | [--version]}

add an example, a script, a trick and tips

: email address (won't be displayed)
: name

Step 2

Thanks for this example ! - It will be moderated and published shortly.

Feel free to post other examples Oops ! There is a tiny cockup. A damn 404 cockup. Please contact the loosy team who maintains and develops this wonderful site by clicking in the mighty feedback button on the side of the page. Say what happened. Thanks!

examples

source

            
  eval "patch1=\${$i}"


  flipdiff $patch1 $patch2 >/dev/null ||
  exit $?


  i=$(($i -
  1))


  done



  # Do it for real.


  # Do it for real.


  i=$(($# -
  1))


  while [
  $i -gt 0 ]


  do


  eval "patch1=\${$i}"


  (set -x;
  flipdiff --in-place $patch1
  $patch2)
  || exit
  $?


  i=$(($i -
  1))


  done

description

flipdiff 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.

The swapped patches are sent to standard output, with a marker line (“=== 8< === cut here === 8< ===”) between them, unless the --in-place option is passed. In that case, the output is written back to the original input files.

options

-p n, --strip-match=n

When comparing filenames, ignore the first n pathname components from both patches. (This is similar to the -p option to GNU patch(1).)

-q, --quiet

Quieter output. Don't emit rationale lines at the beginning of each patch.

-U n, --unified=n

Attempt to display n lines of context (requires at least n lines of context in both input files). (This is similar to the -U option to GNU diff(1).)

-d pattern, --drop-context=PATTERN

Don't display any context on files that match the shell wildcard pattern. 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 fnmatch). This is so that “*/basename”-type patterns can be given without limiting the number of pathname components.

-i, --ignore-case

Consider upper- and lower-case to be the same.

-w, --ignore-all-space

Ignore whitespace changes in patches.

-b, --ignore-space-change

Ignore changes in the amount of whitespace.

-B, --ignore-blank-lines

Ignore changes whose lines are all blank.

-z, --decompress

Decompress files with extensions .gz and .bz2.

--in-place

Write output to the original input files.

--help

Display a short usage message.

--version

Display the version number of flipdiff.

limitations

This is only been very lightly tested, and may not even work. Using --in-place is not recommended at the moment.

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.

Because of this, it is generally a good idea to read through the output to check that it makes sense.

author

Tim Waugh <twaugh[:at:]redhat[:dot:]com>

Package maintainer