74 lines
2.3 KiB
Groff
74 lines
2.3 KiB
Groff
.TH GENDIFF 1 "Mon Jan 10 2000"
|
|
.UC 4
|
|
.SH NAME
|
|
gendiff \- utility to aid in error-free diff file generation
|
|
.SH SYNOPSIS
|
|
\fBgendiff\fR [diff-options] <directory> <diff-siffux> [patch-name]
|
|
.SH DESCRIPTION
|
|
\fBgendiff\fR is a rather simple script which aids in generating a
|
|
diff file from a single directory. It takes a directory name and a
|
|
"diff-extension" as its only arguments. The diff extension should be
|
|
a unique sequence of characters added to the end of all original,
|
|
unmodified files. The output of the program is a diff file which may
|
|
be applied with the \fBpatch\fR program to recreate the changes.
|
|
.PP
|
|
The usual sequence of events for creating a diff is to create two
|
|
identical directories, make changes in one directory, and then use the
|
|
\fBdiff\fR utility to create a list of differences between the two.
|
|
Using gendiff eliminates the need for the extra, original and
|
|
unmodified directory copy. Instead, only the individual files that
|
|
are modified need to be saved.
|
|
.PP
|
|
Before editing a file, copy the file, appending the extension you have chosen
|
|
to the filename. I.e. if you were going to edit somefile.cpp and have chosen
|
|
the extension "fix", copy it to somefile.cpp.fix before editing it.
|
|
(If you are a Vim user, you may want to just set the patchmode option.)
|
|
Then edit the first copy (somefile.cpp).
|
|
.PP
|
|
After editing all the files you need to edit in this fashion, enter the
|
|
directory one level above where your source code resides, and then type
|
|
.SP
|
|
.nf
|
|
$ gendiff somedirectory .fix > mydiff-fix.patch
|
|
.fi
|
|
or simply
|
|
.nf
|
|
$ gendiff somedirectory .fix fix
|
|
.fi
|
|
In the latter case,
|
|
.I somedirectory-fix.patch
|
|
file will be created under your
|
|
.I SOURCES
|
|
directory.
|
|
.PP
|
|
|
|
.SH OPTIONS
|
|
The following GNU diff options are recognized:
|
|
.TP
|
|
\fB\-i\fR \fB\-\-ignore\-case\fR
|
|
Ignore case differences in file contents.
|
|
.TP
|
|
\fB\-E\fR \fB\-\-ignore\-tab\-expansion\fR
|
|
Ignore changes due to tab expansion.
|
|
.TP
|
|
\fB\-b\fR \fB\-\-ignore\-space\-change\fR
|
|
Ignore changes in the amount of white space.
|
|
.TP
|
|
\fB\-w\fR \fB\-\-ignore\-all\-space\fR
|
|
Ignore all white space.
|
|
.TP
|
|
\fB\-B\fR \fB\-\-ignore\-blank\-lines\fR
|
|
Ignore changes whose lines are all blank.
|
|
.TP
|
|
\fB\-a\fR \fB\-\-text\fR
|
|
Treat all files as text.
|
|
|
|
.SH "SEE ALSO"
|
|
.BR diff (1),
|
|
.BR patch (1)
|
|
|
|
.SH AUTHOR
|
|
.nf
|
|
Marc Ewing <marc@redhat.com>
|
|
.fi
|