Return to rcsdiff.1 CVS log

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

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

1.21    ! jmc         1: .\"    $OpenBSD: rcsdiff.1,v 1.20 2006/04/19 12:57:02 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.18      jmc        30: .Ar
1.1       joris      31: .Sh DESCRIPTION
                     32: The
                     33: .Nm
1.18      jmc        34: program is used to compare revisions of RCS files,
                     35: in much the same way as the
                     36: .Xr diff 1
                     37: utility.
                     38: Differences between two specific revisions can be requested,
                     39: as well as differences between the current working file and
                     40: the latest revision of the default branch.
                     41: .Pp
                     42: It is not possible to display differences between entire directories,
                     43: or differences between more than two files.
                     44: All diffs produced are in the standard diff format,
                     45: unless the
                     46: .Fl u
                     47: option is specified,
                     48: which produces unified diffs.
                     49: .Pp
                     50: .Nm
                     51: also supports
                     52: keyword substitution \(en
                     53: see the
1.19      jmc        54: .Xr rcs 1
1.18      jmc        55: man page for more information.
1.1       joris      56: .Pp
                     57: The following options are supported:
                     58: .Bl -tag -width Ds
1.2       joris      59: .It Fl c
1.4       jmc        60: Produces a diff with three lines of context.
                     61: See
1.2       joris      62: .Xr diff 1
                     63: for more information.
1.12      xsa        64: .It Fl k Ns Ar mode
                     65: Specify the keyword substitution mode.
1.2       joris      66: .It Fl n
1.6       joris      67: Produces a diff in the same format that is used in the RCS files.
1.7       niallo     68: .It Fl r Ns Ar rev
1.21    ! jmc        69: Produces a diff with respect to revision
1.8       jmc        70: .Ar rev .
1.21    ! jmc        71: This option should be specified twice to generate a diff
        !            72: between two specific revisions.
        !            73: If only one revision is specified,
        !            74: diffing is done between that revision and
        !            75: the latest revision of the default branch.
1.1       joris      76: .It Fl q
                     77: Be quiet about reporting.
1.2       joris      78: .It Fl u
1.4       jmc        79: Produces a unified diff with three lines of context.
                     80: See
1.2       joris      81: .Xr diff 1
                     82: for more information.
1.1       joris      83: .It Fl V
                     84: Print RCS's version number.
1.11      xsa        85: .It Fl x Ns Ar suffixes
                     86: Specifies the suffixes for RCS files.
                     87: Suffixes should be separated by the
                     88: .Sq /
                     89: character.
1.14      xsa        90: .It Fl z Ns Ar tz
                     91: Specify the date output format.
1.1       joris      92: .El
                     93: .Sh ENVIRONMENT
                     94: .Bl -tag -width RCSINIT
                     95: .It Ev RCSINIT
                     96: If set, this variable should contain a list of space-delimited options that
                     97: are prepended to the argument list.
1.10      xsa        98: .It Ev TMPDIR
                     99: When set, this variable specifies the directory where temporary files
                    100: are to be created.
                    101: The default is set to
                    102: .Pa /tmp .
1.1       joris     103: .El
1.12      xsa       104: .Sh EXAMPLES
                    105: Compare the latest revision of the default branch with the content of
                    106: working file
                    107: .Pa foo.c :
                    108: .Pp
                    109: .Dl $ rcsdiff foo.c
                    110: .Pp
                    111: Compare revision 1.7 and 1.8 of file
                    112: .Pa foo.c
                    113: and ignore differences in keyword values:
                    114: .Pp
                    115: .Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c
1.1       joris     116: .Sh SEE ALSO
1.5       xsa       117: .Xr ci 1 ,
1.1       joris     118: .Xr co 1 ,
1.20      jmc       119: .Xr diff 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.