Annotation of src/usr.bin/rcs/rcsdiff.1, Revision 1.26
1.26 ! niallo 1: .\" $OpenBSD: rcsdiff.1,v 1.25 2006/09/22 13:42:43 jmc Exp $
1.1 joris 2: .\"
3: .\" Copyright (c) 2005 Joris Vink <joris@openbsd.org>
4: .\" All rights reserved.
5: .\"
6: .\" Permission to use, copy, modify, and distribute this software for any
7: .\" purpose with or without fee is hereby granted, provided that the above
8: .\" copyright notice and this permission notice appear in all copies.
9: .\"
10: .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11: .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12: .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13: .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14: .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15: .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16: .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17: .Dd October 08, 2005
18: .Dt RCSDIFF 1
19: .Os
20: .Sh NAME
21: .Nm rcsdiff
22: .Nd compare RCS revisions
23: .Sh SYNOPSIS
24: .Nm
1.17 jmc 25: .Op Fl cnquV
1.12 xsa 26: .Op Fl k Ns Ar mode
1.21 jmc 27: .Op Fl r Ns Ar rev
1.11 xsa 28: .Op Fl x Ns Ar suffixes
1.14 xsa 29: .Op Fl z Ns Ar tz
1.25 jmc 30: .Op Ar diff_options
1.18 jmc 31: .Ar
1.1 joris 32: .Sh DESCRIPTION
33: The
34: .Nm
1.18 jmc 35: program is used to compare revisions of RCS files,
36: in much the same way as the
37: .Xr diff 1
38: utility.
39: Differences between two specific revisions can be requested,
40: as well as differences between the current working file and
41: the latest revision of the default branch.
42: .Pp
43: It is not possible to display differences between entire directories,
44: or differences between more than two files.
45: All diffs produced are in the standard diff format,
46: unless the
47: .Fl u
48: option is specified,
49: which produces unified diffs.
50: .Pp
51: .Nm
52: also supports
53: keyword substitution \(en
54: see the
1.19 jmc 55: .Xr rcs 1
1.18 jmc 56: man page for more information.
1.1 joris 57: .Pp
58: The following options are supported:
59: .Bl -tag -width Ds
1.2 joris 60: .It Fl c
1.4 jmc 61: Produces a diff with three lines of context.
62: See
1.2 joris 63: .Xr diff 1
64: for more information.
1.12 xsa 65: .It Fl k Ns Ar mode
66: Specify the keyword substitution mode.
1.2 joris 67: .It Fl n
1.6 joris 68: Produces a diff in the same format that is used in the RCS files.
1.26 ! niallo 69: .It Fl q
! 70: Be quiet about reporting.
1.7 niallo 71: .It Fl r Ns Ar rev
1.21 jmc 72: Produces a diff with respect to revision
1.8 jmc 73: .Ar rev .
1.21 jmc 74: This option should be specified twice to generate a diff
75: between two specific revisions.
76: If only one revision is specified,
77: diffing is done between that revision and
78: the latest revision of the default branch.
1.2 joris 79: .It Fl u
1.4 jmc 80: Produces a unified diff with three lines of context.
81: See
1.2 joris 82: .Xr diff 1
83: for more information.
1.1 joris 84: .It Fl V
85: Print RCS's version number.
1.11 xsa 86: .It Fl x Ns Ar suffixes
87: Specifies the suffixes for RCS files.
88: Suffixes should be separated by the
89: .Sq /
90: character.
1.14 xsa 91: .It Fl z Ns Ar tz
92: Specify the date output format.
1.25 jmc 93: .It Ar diff_options
94: Any of the options documented in
95: .Xr diff 1
96: may also be specified.
1.1 joris 97: .El
98: .Sh ENVIRONMENT
99: .Bl -tag -width RCSINIT
100: .It Ev RCSINIT
101: If set, this variable should contain a list of space-delimited options that
102: are prepended to the argument list.
1.10 xsa 103: .It Ev TMPDIR
104: When set, this variable specifies the directory where temporary files
105: are to be created.
106: The default is set to
107: .Pa /tmp .
1.1 joris 108: .El
1.12 xsa 109: .Sh EXAMPLES
110: Compare the latest revision of the default branch with the content of
111: working file
112: .Pa foo.c :
113: .Pp
114: .Dl $ rcsdiff foo.c
115: .Pp
116: Compare revision 1.7 and 1.8 of file
117: .Pa foo.c
118: and ignore differences in keyword values:
119: .Pp
120: .Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c
1.22 xsa 121: .Sh DIAGNOSTICS
122: The
123: .Nm
124: utility exits with one of the following values:
125: .Pp
126: .Bl -tag -width Ds -compact -offset indent
127: .It 0
128: No differences were found.
129: .It 1
130: Differences were found.
131: .It 2
132: An error occurred.
133: .El
1.1 joris 134: .Sh SEE ALSO
1.5 xsa 135: .Xr ci 1 ,
1.1 joris 136: .Xr co 1 ,
1.20 jmc 137: .Xr diff 1 ,
1.3 niallo 138: .Xr ident 1 ,
1.1 joris 139: .Xr rcs 1 ,
140: .Xr rcsclean 1 ,
1.9 xsa 141: .Xr rcsmerge 1 ,
1.5 xsa 142: .Xr rlog 1
1.17 jmc 143: .Sh STANDARDS
144: The flag
145: .Op Fl T
146: has no effect and is provided
147: for compatibility only.
![[BACK]](/icons/back.gif){kind=icon}
Return to rcsdiff.1 CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs