Return to rcsdiff.1 CVS log

Up to [local] / src / usr.bin / rcs

Annotation of src/usr.bin/rcs/rcsdiff.1, Revision 1.17

1.17    ! jmc         1: .\"    $OpenBSD: rcsdiff.1,v 1.16 2006/03/06 09:41:53 deraadt 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.17    ! jmc        26: .Op Fl cnquV
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.2       joris      60: .It Fl u
1.4       jmc        61: Produces a unified diff with three lines of context.
                     62: See
1.2       joris      63: .Xr diff 1
                     64: for more information.
1.1       joris      65: .It Fl V
                     66: Print RCS's version number.
1.11      xsa        67: .It Fl x Ns Ar suffixes
                     68: Specifies the suffixes for RCS files.
                     69: Suffixes should be separated by the
                     70: .Sq /
                     71: character.
1.14      xsa        72: .It Fl z Ns Ar tz
                     73: Specify the date output format.
1.1       joris      74: .El
                     75: .Sh ENVIRONMENT
                     76: .Bl -tag -width RCSINIT
                     77: .It Ev RCSINIT
                     78: If set, this variable should contain a list of space-delimited options that
                     79: are prepended to the argument list.
1.10      xsa        80: .It Ev TMPDIR
                     81: When set, this variable specifies the directory where temporary files
                     82: are to be created.
                     83: The default is set to
                     84: .Pa /tmp .
1.1       joris      85: .El
1.12      xsa        86: .Sh EXAMPLES
                     87: Compare the latest revision of the default branch with the content of
                     88: working file
                     89: .Pa foo.c :
                     90: .Pp
                     91: .Dl $ rcsdiff foo.c
                     92: .Pp
                     93: Compare revision 1.7 and 1.8 of file
                     94: .Pa foo.c
                     95: and ignore differences in keyword values:
                     96: .Pp
                     97: .Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c
1.1       joris      98: .Sh SEE ALSO
1.5       xsa        99: .Xr ci 1 ,
1.1       joris     100: .Xr co 1 ,
1.3       niallo    101: .Xr ident 1 ,
1.1       joris     102: .Xr rcs 1 ,
                    103: .Xr rcsclean 1 ,
1.9       xsa       104: .Xr rcsmerge 1 ,
1.5       xsa       105: .Xr rlog 1
1.17    ! jmc       106: .Sh STANDARDS
        !           107: The flag
        !           108: .Op Fl T
        !           109: has no effect and is provided
        !           110: for compatibility only.