'\" t .\" Title: flipdiff .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot .\" Date: 23 January 2009 .\" Manual: Man pages .\" Source: patchutils .\" Language: English .\" .TH "FLIPDIFF" "1" "23 January 2009" "patchutils" "Man pages" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .\" http://bugs.debian.org/507673 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" flipdiff \- exchange the order of two incremental patches .SH "SYNOPSIS" .HP \w'\fBflipdiff\fR\ 'u \fBflipdiff\fR [[\-p\ \fIn\fR] | [\-\-strip\-match=\fIn\fR]] [[\-U\ \fIn\fR] | [\-\-unified=\fIn\fR]] [[\-d\ \fIPAT\fR] | [\-\-drop\-context=\fIPAT\fR]] [[\-q] | [\-\-quiet]] [[\-z] | [\-\-decompress]] [[\-b] | [\-\-ignore\-space\-change]] [[\-B] | [\-\-ignore\-blank\-lines]] [[\-i] | [\-\-ignore\-case]] [[\-w] | [\-\-ignore\-all\-space]] [\-\-in\-place] \fIdiff1\fR \fIdiff2\fR .HP \w'\fBflipdiff\fR\ 'u \fBflipdiff\fR {[\-\-help] | [\-\-version]} .SH "DESCRIPTION" .PP \fBflipdiff\fR exchanges the order of two patch files that apply one after the other\&. The patches must be \(lqclean\(rq: 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 (\(lq===\ \&8<\ \&===\ \&cut\ \&here\ \&===\ \&8<\ \&===\(rq) 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" .PP \fB\-p\fR \fIn\fR, \fB\-\-strip\-match=\fR\fB\fIn\fR\fR .RS 4 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)\&.) .RE .PP \fB\-q\fR, \fB\-\-quiet\fR .RS 4 Quieter output\&. Don\*(Aqt emit rationale lines at the beginning of each patch\&. .RE .PP \fB\-U\fR \fIn\fR, \fB\-\-unified=\fR\fB\fIn\fR\fR .RS 4 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)\&.) .RE .PP \fB\-d\fR \fIpattern\fR, \fB\-\-drop\-context=\fR\fB\fIPATTERN\fR\fR .RS 4 Don\*(Aqt display any context on files that match the shell wildcard \fIpattern\fR\&. This option can be given multiple times\&. .sp 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 \(lq*/basename\(rq\-type patterns can be given without limiting the number of pathname components\&. .RE .PP \fB\-i\fR, \fB\-\-ignore\-case\fR .RS 4 Consider upper\- and lower\-case to be the same\&. .RE .PP \fB\-w\fR, \fB\-\-ignore\-all\-space\fR .RS 4 Ignore whitespace changes in patches\&. .RE .PP \fB\-b\fR, \fB\-\-ignore\-space\-change\fR .RS 4 Ignore changes in the amount of whitespace\&. .RE .PP \fB\-B\fR, \fB\-\-ignore\-blank\-lines\fR .RS 4 Ignore changes whose lines are all blank\&. .RE .PP \fB\-z\fR, \fB\-\-decompress\fR .RS 4 Decompress files with extensions \&.gz and \&.bz2\&. .RE .PP \fB\-\-in\-place\fR .RS 4 Write output to the original input files\&. .RE .PP \fB\-\-help\fR .RS 4 Display a short usage message\&. .RE .PP \fB\-\-version\fR .RS 4 Display the version number of flipdiff\&. .RE .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" .PP \fBTim Waugh\fR <\&twaugh@redhat.com\&> .RS 4 Package maintainer .RE