Annotation of src/usr.bin/rcs/rcsdiff.1, Revision 1.15
1.15 ! xsa 1: .\" $OpenBSD: rcsdiff.1,v 1.14 2005/11/30 08:53:29 xsa 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
25: .Bk -words
1.15 ! xsa 26: .Op Fl cnqTuV
1.12 xsa 27: .Op Fl k Ns Ar mode
1.3 niallo 28: .Oo
1.7 niallo 29: .Fl r Ns Ar rev
30: .Op Fl r Ns Ar rev2
1.3 niallo 31: .Oc
1.11 xsa 32: .Op Fl x Ns Ar suffixes
1.14 xsa 33: .Op Fl z Ns Ar tz
1.1 joris 34: .Ar file ...
35: .Ek
36: .Sh DESCRIPTION
37: The
38: .Nm
1.4 jmc 39: program is used to compare two revisions of each RCS file given.
1.1 joris 40: .Pp
41: The following options are supported:
42: .Bl -tag -width Ds
1.2 joris 43: .It Fl c
1.4 jmc 44: Produces a diff with three lines of context.
45: See
1.2 joris 46: .Xr diff 1
47: for more information.
1.12 xsa 48: .It Fl k Ns Ar mode
49: Specify the keyword substitution mode.
1.2 joris 50: .It Fl n
1.6 joris 51: Produces a diff in the same format that is used in the RCS files.
1.7 niallo 52: .It Fl r Ns Ar rev
1.3 niallo 53: If one -r option is given, the diff is generated between the
54: working file and
1.8 jmc 55: .Ar rev .
1.3 niallo 56: If two -r options are given, the diff is generated between the
57: two revisions specified.
1.1 joris 58: .It Fl q
59: Be quiet about reporting.
1.15 ! xsa 60: .It Fl T
! 61: No effect.
! 62: For compatibility.
1.2 joris 63: .It Fl u
1.4 jmc 64: Produces a unified diff with three lines of context.
65: See
1.2 joris 66: .Xr diff 1
67: for more information.
1.1 joris 68: .It Fl V
69: Print RCS's version number.
1.11 xsa 70: .It Fl x Ns Ar suffixes
71: Specifies the suffixes for RCS files.
72: Suffixes should be separated by the
73: .Sq /
74: character.
1.14 xsa 75: .It Fl z Ns Ar tz
76: Specify the date output format.
1.1 joris 77: .El
78: .Sh ENVIRONMENT
79: .Bl -tag -width RCSINIT
80: .It Ev RCSINIT
81: If set, this variable should contain a list of space-delimited options that
82: are prepended to the argument list.
1.10 xsa 83: .It Ev TMPDIR
84: When set, this variable specifies the directory where temporary files
85: are to be created.
86: The default is set to
87: .Pa /tmp .
1.1 joris 88: .El
1.12 xsa 89: .Sh EXAMPLES
90: Compare the latest revision of the default branch with the content of
91: working file
92: .Pa foo.c :
93: .Pp
94: .Dl $ rcsdiff foo.c
95: .Pp
96: Compare revision 1.7 and 1.8 of file
97: .Pa foo.c
98: and ignore differences in keyword values:
99: .Pp
100: .Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c
1.1 joris 101: .Sh SEE ALSO
1.5 xsa 102: .Xr ci 1 ,
1.1 joris 103: .Xr co 1 ,
1.3 niallo 104: .Xr ident 1 ,
1.1 joris 105: .Xr rcs 1 ,
106: .Xr rcsclean 1 ,
1.9 xsa 107: .Xr rcsmerge 1 ,
1.5 xsa 108: .Xr rlog 1