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