Return to rcsmerge.1 CVS log

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

Annotation of src/usr.bin/rcs/rcsmerge.1, Revision 1.3

1.3     ! xsa         1: .\"     $OpenBSD: rcsmerge.1,v 1.2 2005/11/02 11:26:19 xsa Exp $
1.1       xsa         2: .\"
                      3: .\" Copyright (c) 2005 Xavier Santolaria <xsa@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 12, 2005
                     18: .Dt RCSMERGE 1
                     19: .Os
                     20: .Sh NAME
                     21: .Nm rcsmerge
                     22: .Nd merge RCS revisions
                     23: .Sh SYNOPSIS
                     24: .Nm
                     25: .Bk -words
1.2       xsa        26: .Op Fl AEeTV
1.1       xsa        27: .Op Fl k Ns Ar mode
1.2       xsa        28: .Op Fl p Ns Op Ar rev
                     29: .Op Fl q Ns Op Ar rev
1.1       xsa        30: .Op Fl r Ns Ar rev
                     31: .Op Fl x Ns Ar suffixes
                     32: .Op Fl z Ns Ar tz
                     33: .Ar file ...
                     34: .Ek
                     35: .Sh DESCRIPTION
                     36: The
                     37: .Nm
                     38: program merges changes between two revisions of an RCS file into
                     39: the corresponding working file.
                     40: .Pp
                     41: The following options are supported:
                     42: .Bl -tag -width Ds
                     43: .It Fl A
                     44: Most verbose output.
                     45: .It Fl E
                     46: Less information than
                     47: .Fl A .
                     48: This is the default.
                     49: See
                     50: .Xr diff3 1
                     51: for details.
                     52: .It Fl e
                     53: Same as
                     54: .Fl E
                     55: but does not warn about conflicts.
                     56: .It Fl k Ns Ar mode
                     57: Specify the keyword substitution mode.
1.2       xsa        58: .It Fl p Ns Op Ar rev
1.1       xsa        59: Print result to standard output.
1.2       xsa        60: .It Fl q Ns Op Ar rev
1.1       xsa        61: Be quiet about reporting.
                     62: .It Fl r Ns Ar rev
                     63: Merge with respect to revision
                     64: .Ar rev .
                     65: .It Fl T
                     66: No effect.
                     67: For compatibility.
                     68: .It Fl V
                     69: Print RCS's version number.
                     70: .It Fl x Ns Ar suffixes
                     71: Specify the suffixes for RCS files.
                     72: Suffixes should be separated by the
                     73: .Sq /
                     74: character.
                     75: .It Fl z Ns Ar tz
                     76: Specify the time zone for keyword substitution.
                     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.
                     83: .El
1.3     ! xsa        84: .Sh EXAMPLES
        !            85: Merge differences between revision 1.4 and 1.8 of
        !            86: .Pa foo.c
        !            87: and print the result to standard output:
        !            88: .Pp
        !            89: .Dl $ rcsmerge -p -r1.4 -r1.8 foo.c
        !            90: .Pp
        !            91: Undo changes between revision 2.4 and 2.8 of
        !            92: .Pa foo.c ,
        !            93: overwriting the working copy:
        !            94: .Pp
        !            95: .Dl $ rcsmerge -r2.8 -r2.4 foo.c
1.1       xsa        96: .Sh SEE ALSO
                     97: .Xr ci 1 ,
                     98: .Xr co 1 ,
                     99: .Xr ident 1 ,
                    100: .Xr rcs 1 ,
                    101: .Xr rcsclean 1 ,
                    102: .Xr rcsdiff 1 ,
                    103: .Xr rlog 1