rcsdiff(1) rcsdiff(1)NAME rcsdiff - compares RCS revisions SYNOPSIS rcsdiff [-b] [-c] [-e] [-f] [-h] [-i] [-n] [-t] [-w] [-rrev1] [-rrev2] file ... ARGUMENTS -b Causes trailing blanks (spaces and tabs) to be ignored, and other strings of blanks to compare equal. -c Produces a diff with lines of context. The default is to present 3 lines of context and may be changed, e.g., to 10, by -c10. With the -c option, the output format is modified slightly: the output beginning with identification of the files involved and their creation dates and then each change is separated by a line with a dozen *'s. The lines removed from file1 are marked with ``-''; those added to file2 are marked ``+''. Lines which are changed from one file to the other are marked in both files with ``!''. -e Produces a script of a, c, and d commands for the editor ed, which will recreate file2 from file1. In connection with the -e, option, the following shell program may help maintain multiple versions of a file. Only an ancestral file ($1) and a chain of version-to- version ed scripts ($2,$3, . . .) made by diff need be on hand. A ``latest version'' appears on the standard output. (shift; cat $*; echo '1,$p') | ed - $1 Extra commands are added to the output when comparing directories with the -e, option so that the result is a sh(1) script for converting text files which are common to the two directories from their state in dir1 to their state in dir2. Since such a shell script is useful only in a file that you may run on other files, it is best to redirect the output of this command into a file. -f Produces a script similar to that of the -e, option not useful with ed, and in the opposite order. file Specifies the RCS file which has different versions that are to be compared. -h Does a fast, half-hearted job. It works only when changed stretches are short and well-separated, but does work on files of unlimited length. January 1992 1
rcsdiff(1) rcsdiff(1)-i Ignores lower and upper case character differences. -n Produces a script similar to that of the -f option but with a count of changed lines added. -t Expands tabs in output lines, preserving correct indentation of the source text. -w Causes spaces and tabs to be ignored. -rrev1 Specifies the first revision of the RCS file that is compared with rev2. If this argument is given, but not rev2, rcsdiff compares rev1 of the RCS file with the contents of the corresponding working file. -rrev2 Specifies the second revision of the RCS file that is compared with rev1. DESCRIPTION rcsdiff runs ucbdiff(1) to compare two revisions of each RCS file given. A filename ending in ,v is an RCS filename, otherwise a working filename. rcsdiff derives the working filename from the RCS filename and vice versa, as explained in co(1). Pairs consisting of both an RCS and a working filename may also be specified. If both rev1 and rev2 are omitted, rcsdiff compares the latest revision on the trunk with the contents of the corresponding working file. This is useful for determining what was changed since the last checkin. If both rev1 and rev2 are given, rcsdiff compares revisions rev1 and rev2 of the RCS file. Both rev1 and rev2 may be given numerically or symbolically. EXAMPLES The command: rcsdiff f.c runs ucbdiff on the latest trunk revision of RCS file f.c,v and the contents of working file f.c. NOTES Author: Walter F. Tichy, Purdue University, West Lafayette, IN 47907.cCopyright 1982 by Walter F. Tichy.2 January 1992
rcsdiff(1) rcsdiff(1)SEE ALSO ci(1), co(1), ucbdiff(1), ident(1), rcs(1), rcsintro(1), rcsmerge(1), rlog(1) rcsfile(4) in A/UX Programmer's Reference Walter F. Tichy, ``Design, Implementation, and Evaluation of a Revision Control System,'' in Proceedings of the 6th International Conference on Software Engineering, IEEE, Tokyo, Sept. 1982 January 1992 3