Annotation of src/usr.bin/rcs/rcsmerge.1, Revision 1.6
1.6 ! jmc 1: .\" $OpenBSD: rcsmerge.1,v 1.5 2006/03/06 14:44:51 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.5 jmc 25: .Op Fl AEeV
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 r Ns Ar rev
30: .Op Fl x Ns Ar suffixes
31: .Op Fl z Ns Ar tz
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.6 ! jmc 38: .Pp
! 39: .Nm
! 40: also supports
! 41: keyword substitution \(en
! 42: see the
! 43: .Xr rcs 1
! 44: man page for more information.
1.1 xsa 45: .Pp
46: The following options are supported:
47: .Bl -tag -width Ds
48: .It Fl A
49: Most verbose output.
50: .It Fl E
51: Less information than
52: .Fl A .
53: This is the default.
54: See
55: .Xr diff3 1
56: for details.
57: .It Fl e
58: Same as
59: .Fl E
60: but does not warn about conflicts.
61: .It Fl k Ns Ar mode
62: Specify the keyword substitution mode.
1.2 xsa 63: .It Fl p Ns Op Ar rev
1.1 xsa 64: Print result to standard output.
1.2 xsa 65: .It Fl q Ns Op Ar rev
1.1 xsa 66: Be quiet about reporting.
67: .It Fl r Ns Ar rev
68: Merge with respect to revision
69: .Ar rev .
70: .It Fl V
71: Print RCS's version number.
72: .It Fl x Ns Ar suffixes
73: Specify the suffixes for RCS files.
74: Suffixes should be separated by the
75: .Sq /
76: character.
77: .It Fl z Ns Ar tz
78: Specify the time zone for keyword substitution.
79: .El
80: .Sh ENVIRONMENT
81: .Bl -tag -width RCSINIT
82: .It Ev RCSINIT
83: If set, this variable should contain a list of space-delimited options that
84: are prepended to the argument list.
85: .El
1.3 xsa 86: .Sh EXAMPLES
87: Merge differences between revision 1.4 and 1.8 of
88: .Pa foo.c
89: and print the result to standard output:
90: .Pp
91: .Dl $ rcsmerge -p -r1.4 -r1.8 foo.c
92: .Pp
93: Undo changes between revision 2.4 and 2.8 of
94: .Pa foo.c ,
95: overwriting the working copy:
96: .Pp
97: .Dl $ rcsmerge -r2.8 -r2.4 foo.c
1.1 xsa 98: .Sh SEE ALSO
99: .Xr ci 1 ,
100: .Xr co 1 ,
101: .Xr ident 1 ,
102: .Xr rcs 1 ,
103: .Xr rcsclean 1 ,
104: .Xr rcsdiff 1 ,
105: .Xr rlog 1
1.5 jmc 106: .Sh STANDARDS
107: The flag
108: .Op Fl T
109: has no effect and is provided
110: for compatibility only.