1 | .de Id |
---|
2 | .ds Rv \\$3 |
---|
3 | .ds Dt \\$4 |
---|
4 | .. |
---|
5 | .Id $Id: rcsdiff.1,v 1.1.1.1 1996-10-04 05:52:42 ghudson Exp $ |
---|
6 | .ds r \&\s-1RCS\s0 |
---|
7 | .if n .ds - \%-- |
---|
8 | .if t .ds - \(em |
---|
9 | .TH RCSDIFF 1 \*(Dt GNU |
---|
10 | .SH NAME |
---|
11 | rcsdiff \- compare RCS revisions |
---|
12 | .SH SYNOPSIS |
---|
13 | .B rcsdiff |
---|
14 | [ |
---|
15 | .BI \-k subst |
---|
16 | ] [ |
---|
17 | .B \-q |
---|
18 | ] [ |
---|
19 | .BI \-r rev1 |
---|
20 | [ |
---|
21 | .BI \-r rev2 |
---|
22 | ] ] [ |
---|
23 | .B \-T |
---|
24 | ] [ |
---|
25 | .RI "\f3\-V\fP[" n ] |
---|
26 | ] [ |
---|
27 | .BI \-x suffixes |
---|
28 | ] [ |
---|
29 | .BI \-z zone |
---|
30 | ] [ |
---|
31 | .I "diff options" |
---|
32 | ] |
---|
33 | .I "file .\|.\|." |
---|
34 | .SH DESCRIPTION |
---|
35 | .B rcsdiff |
---|
36 | runs |
---|
37 | .BR diff (1) |
---|
38 | to compare two revisions of each \*r file given. |
---|
39 | .PP |
---|
40 | Pathnames matching an \*r suffix denote \*r files; |
---|
41 | all others denote working files. |
---|
42 | Names are paired as explained in |
---|
43 | .BR ci (1). |
---|
44 | .PP |
---|
45 | The option |
---|
46 | .B \-q |
---|
47 | suppresses diagnostic output. |
---|
48 | Zero, one, or two revisions may be specified with |
---|
49 | .BR \-r . |
---|
50 | The option |
---|
51 | .BI \-k subst |
---|
52 | affects keyword substitution when extracting |
---|
53 | revisions, as described in |
---|
54 | .BR co (1); |
---|
55 | for example, |
---|
56 | .B "\-kk\ \-r1.1\ \-r1.2" |
---|
57 | ignores differences in keyword values when comparing revisions |
---|
58 | .B 1.1 |
---|
59 | and |
---|
60 | .BR 1.2 . |
---|
61 | To avoid excess output from locker name substitution, |
---|
62 | .B \-kkvl |
---|
63 | is assumed if (1) at most one revision option is given, |
---|
64 | (2) no |
---|
65 | .B \-k |
---|
66 | option is given, (3) |
---|
67 | .B \-kkv |
---|
68 | is the default keyword substitution, and |
---|
69 | (4) the working file's mode would be produced by |
---|
70 | .BR "co\ \-l". |
---|
71 | See |
---|
72 | .BR co (1) |
---|
73 | for details |
---|
74 | about |
---|
75 | .BR \-T , |
---|
76 | .BR \-V , |
---|
77 | .B \-x |
---|
78 | and |
---|
79 | .BR \-z . |
---|
80 | Otherwise, all options of |
---|
81 | .BR diff (1) |
---|
82 | that apply to regular files are accepted, with the same meaning as for |
---|
83 | .BR diff . |
---|
84 | .PP |
---|
85 | If both |
---|
86 | .I rev1 |
---|
87 | and |
---|
88 | .I rev2 |
---|
89 | are omitted, |
---|
90 | .B rcsdiff |
---|
91 | compares the latest revision on the |
---|
92 | default branch (by default the trunk) |
---|
93 | with the contents of the corresponding working file. This is useful |
---|
94 | for determining what you changed since the last checkin. |
---|
95 | .PP |
---|
96 | If |
---|
97 | .I rev1 |
---|
98 | is given, but |
---|
99 | .I rev2 |
---|
100 | is omitted, |
---|
101 | .B rcsdiff |
---|
102 | compares revision |
---|
103 | .I rev1 |
---|
104 | of the \*r file with |
---|
105 | the contents of the corresponding working file. |
---|
106 | .PP |
---|
107 | If both |
---|
108 | .I rev1 |
---|
109 | and |
---|
110 | .I rev2 |
---|
111 | are given, |
---|
112 | .B rcsdiff |
---|
113 | compares revisions |
---|
114 | .I rev1 |
---|
115 | and |
---|
116 | .I rev2 |
---|
117 | of the \*r file. |
---|
118 | .PP |
---|
119 | Both |
---|
120 | .I rev1 |
---|
121 | and |
---|
122 | .I rev2 |
---|
123 | may be given numerically or symbolically. |
---|
124 | .SH EXAMPLE |
---|
125 | The command |
---|
126 | .LP |
---|
127 | .B " rcsdiff f.c" |
---|
128 | .LP |
---|
129 | compares the latest revision on the default branch of the \*r file |
---|
130 | to the contents of the working file |
---|
131 | .BR f.c . |
---|
132 | .SH ENVIRONMENT |
---|
133 | .TP |
---|
134 | .B \s-1RCSINIT\s0 |
---|
135 | options prepended to the argument list, separated by spaces. |
---|
136 | See |
---|
137 | .BR ci (1) |
---|
138 | for details. |
---|
139 | .SH DIAGNOSTICS |
---|
140 | Exit status is 0 for no differences during any comparison, |
---|
141 | 1 for some differences, 2 for trouble. |
---|
142 | .SH IDENTIFICATION |
---|
143 | Author: Walter F. Tichy. |
---|
144 | .br |
---|
145 | Manual Page Revision: \*(Rv; Release Date: \*(Dt. |
---|
146 | .br |
---|
147 | Copyright \(co 1982, 1988, 1989 Walter F. Tichy. |
---|
148 | .br |
---|
149 | Copyright \(co 1990, 1991, 1992, 1993 Paul Eggert. |
---|
150 | .SH "SEE ALSO" |
---|
151 | ci(1), co(1), diff(1), ident(1), rcs(1), rcsintro(1), rcsmerge(1), rlog(1) |
---|
152 | .br |
---|
153 | Walter F. Tichy, |
---|
154 | \*r\*-A System for Version Control, |
---|
155 | .I "Software\*-Practice & Experience" |
---|
156 | .BR 15 , |
---|
157 | 7 (July 1985), 637-654. |
---|
158 | .br |
---|