Return to rcsmerge.1 CVS log

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

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

1.9     ! jmc         1: .\"    $OpenBSD: rcsmerge.1,v 1.8 2006/04/24 13:32:10 jmc 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
1.8       jmc        25: .Op Fl EeV
1.1       xsa        26: .Op Fl k Ns Ar mode
1.2       xsa        27: .Op Fl p Ns Op Ar rev
                     28: .Op Fl q Ns Op Ar rev
1.1       xsa        29: .Op Fl x Ns Ar suffixes
                     30: .Op Fl z Ns Ar tz
1.7       jmc        31: .Fl r Ns Ar rev
1.6       jmc        32: .Ar
1.1       xsa        33: .Sh DESCRIPTION
                     34: The
                     35: .Nm
                     36: program merges changes between two revisions of an RCS file into
                     37: the corresponding working file.
1.9     ! jmc        38: .Pp
        !            39: Files may be selected by revision or,
        !            40: where no revision is specified,
        !            41: the latest revision of the default branch is used.
        !            42: Revisions are specified either by using the
        !            43: .Fl r
        !            44: option or
        !            45: by appending the revision number to any option that supports it.
1.6       jmc        46: .Pp
                     47: .Nm
                     48: also supports
                     49: keyword substitution \(en
                     50: see the
                     51: .Xr rcs 1
                     52: man page for more information.
1.1       xsa        53: .Pp
                     54: The following options are supported:
                     55: .Bl -tag -width Ds
                     56: .It Fl E
1.8       jmc        57: Default merge:
                     58: see
1.1       xsa        59: .Xr diff3 1
                     60: for details.
                     61: .It Fl e
                     62: Same as
                     63: .Fl E
                     64: but does not warn about conflicts.
                     65: .It Fl k Ns Ar mode
                     66: Specify the keyword substitution mode.
1.2       xsa        67: .It Fl p Ns Op Ar rev
1.1       xsa        68: Print result to standard output.
1.2       xsa        69: .It Fl q Ns Op Ar rev
1.1       xsa        70: Be quiet about reporting.
                     71: .It Fl r Ns Ar rev
                     72: Merge with respect to revision
                     73: .Ar rev .
1.7       jmc        74: This option should be specified twice to merge changes
                     75: between two specific revisions.
                     76: If only one revision is specified,
                     77: merging is done between that revision and
                     78: the latest revision of the default branch.
1.1       xsa        79: .It Fl V
                     80: Print RCS's version number.
                     81: .It Fl x Ns Ar suffixes
                     82: Specify the suffixes for RCS files.
                     83: Suffixes should be separated by the
                     84: .Sq /
                     85: character.
                     86: .It Fl z Ns Ar tz
                     87: Specify the time zone for keyword substitution.
                     88: .El
                     89: .Sh ENVIRONMENT
                     90: .Bl -tag -width RCSINIT
                     91: .It Ev RCSINIT
                     92: If set, this variable should contain a list of space-delimited options that
                     93: are prepended to the argument list.
                     94: .El
1.3       xsa        95: .Sh EXAMPLES
                     96: Merge differences between revision 1.4 and 1.8 of
                     97: .Pa foo.c
                     98: and print the result to standard output:
                     99: .Pp
                    100: .Dl $ rcsmerge -p -r1.4 -r1.8 foo.c
                    101: .Pp
                    102: Undo changes between revision 2.4 and 2.8 of
                    103: .Pa foo.c ,
                    104: overwriting the working copy:
                    105: .Pp
                    106: .Dl $ rcsmerge -r2.8 -r2.4 foo.c
1.1       xsa       107: .Sh SEE ALSO
                    108: .Xr ci 1 ,
                    109: .Xr co 1 ,
                    110: .Xr ident 1 ,
                    111: .Xr rcs 1 ,
                    112: .Xr rcsclean 1 ,
                    113: .Xr rcsdiff 1 ,
                    114: .Xr rlog 1
1.5       jmc       115: .Sh STANDARDS
1.8       jmc       116: The flags
                    117: .Op Fl AT
                    118: have no effect and are provided
1.5       jmc       119: for compatibility only.