Return to rcsdiff.1 CVS log

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

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

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