Annotation of src/usr.bin/rcs/rcsdiff.1, Revision 1.18
1.18 ! jmc 1: .\" $OpenBSD: rcsdiff.1,v 1.17 2006/03/06 14:41:04 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.3 niallo 27: .Oo
1.7 niallo 28: .Fl r Ns Ar rev
29: .Op Fl r Ns Ar rev2
1.3 niallo 30: .Oc
1.11 xsa 31: .Op Fl x Ns Ar suffixes
1.14 xsa 32: .Op Fl z Ns Ar tz
1.18 ! jmc 33: .Ar
1.1 joris 34: .Sh DESCRIPTION
35: The
36: .Nm
1.18 ! jmc 37: program is used to compare revisions of RCS files,
! 38: in much the same way as the
! 39: .Xr diff 1
! 40: utility.
! 41: Differences between two specific revisions can be requested,
! 42: as well as differences between the current working file and
! 43: the latest revision of the default branch.
! 44: .Pp
! 45: It is not possible to display differences between entire directories,
! 46: or differences between more than two files.
! 47: All diffs produced are in the standard diff format,
! 48: unless the
! 49: .Fl u
! 50: option is specified,
! 51: which produces unified diffs.
! 52: .Pp
! 53: .Nm
! 54: also supports
! 55: keyword substitution \(en
! 56: see the
! 57: .Xr cvs 1
! 58: man page for more information.
1.1 joris 59: .Pp
60: The following options are supported:
61: .Bl -tag -width Ds
1.2 joris 62: .It Fl c
1.4 jmc 63: Produces a diff with three lines of context.
64: See
1.2 joris 65: .Xr diff 1
66: for more information.
1.12 xsa 67: .It Fl k Ns Ar mode
68: Specify the keyword substitution mode.
1.2 joris 69: .It Fl n
1.6 joris 70: Produces a diff in the same format that is used in the RCS files.
1.7 niallo 71: .It Fl r Ns Ar rev
1.3 niallo 72: If one -r option is given, the diff is generated between the
73: working file and
1.8 jmc 74: .Ar rev .
1.3 niallo 75: If two -r options are given, the diff is generated between the
76: two revisions specified.
1.1 joris 77: .It Fl q
78: Be quiet about reporting.
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.1 joris 93: .El
94: .Sh ENVIRONMENT
95: .Bl -tag -width RCSINIT
96: .It Ev RCSINIT
97: If set, this variable should contain a list of space-delimited options that
98: are prepended to the argument list.
1.10 xsa 99: .It Ev TMPDIR
100: When set, this variable specifies the directory where temporary files
101: are to be created.
102: The default is set to
103: .Pa /tmp .
1.1 joris 104: .El
1.12 xsa 105: .Sh EXAMPLES
106: Compare the latest revision of the default branch with the content of
107: working file
108: .Pa foo.c :
109: .Pp
110: .Dl $ rcsdiff foo.c
111: .Pp
112: Compare revision 1.7 and 1.8 of file
113: .Pa foo.c
114: and ignore differences in keyword values:
115: .Pp
116: .Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c
1.1 joris 117: .Sh SEE ALSO
1.5 xsa 118: .Xr ci 1 ,
1.1 joris 119: .Xr co 1 ,
1.3 niallo 120: .Xr ident 1 ,
1.1 joris 121: .Xr rcs 1 ,
122: .Xr rcsclean 1 ,
1.9 xsa 123: .Xr rcsmerge 1 ,
1.5 xsa 124: .Xr rlog 1
1.17 jmc 125: .Sh STANDARDS
126: The flag
127: .Op Fl T
128: has no effect and is provided
129: for compatibility only.