Annotation of src/usr.bin/rcs/rcsmerge.1, Revision 1.10
1.10 ! jmc 1: .\" $OpenBSD: rcsmerge.1,v 1.9 2006/04/24 22:06:49 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.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 E
1.8 jmc 49: Default merge:
50: see
1.1 xsa 51: .Xr diff3 1
52: for details.
53: .It Fl e
54: Same as
55: .Fl E
56: but does not warn about conflicts.
57: .It Fl k Ns Ar mode
58: Specify the keyword substitution mode.
1.2 xsa 59: .It Fl p Ns Op Ar rev
1.1 xsa 60: Print result to standard output.
1.2 xsa 61: .It Fl q Ns Op Ar rev
1.1 xsa 62: Be quiet about reporting.
63: .It Fl r Ns Ar rev
64: Merge with respect to revision
65: .Ar rev .
1.7 jmc 66: This option should be specified twice to merge changes
67: between two specific revisions.
68: If only one revision is specified,
69: merging is done between that revision and
70: the latest revision of the default branch.
1.1 xsa 71: .It Fl V
72: Print RCS's version number.
73: .It Fl x Ns Ar suffixes
74: Specify the suffixes for RCS files.
75: Suffixes should be separated by the
76: .Sq /
77: character.
78: .It Fl z Ns Ar tz
79: Specify the time zone for keyword substitution.
80: .El
81: .Sh ENVIRONMENT
82: .Bl -tag -width RCSINIT
83: .It Ev RCSINIT
84: If set, this variable should contain a list of space-delimited options that
85: are prepended to the argument list.
86: .El
1.3 xsa 87: .Sh EXAMPLES
88: Merge differences between revision 1.4 and 1.8 of
89: .Pa foo.c
90: and print the result to standard output:
91: .Pp
92: .Dl $ rcsmerge -p -r1.4 -r1.8 foo.c
93: .Pp
94: Undo changes between revision 2.4 and 2.8 of
95: .Pa foo.c ,
96: overwriting the working copy:
97: .Pp
98: .Dl $ rcsmerge -r2.8 -r2.4 foo.c
1.1 xsa 99: .Sh SEE ALSO
100: .Xr ci 1 ,
101: .Xr co 1 ,
102: .Xr ident 1 ,
103: .Xr rcs 1 ,
104: .Xr rcsclean 1 ,
105: .Xr rcsdiff 1 ,
106: .Xr rlog 1
1.5 jmc 107: .Sh STANDARDS
1.8 jmc 108: The flags
109: .Op Fl AT
110: have no effect and are provided
1.5 jmc 111: for compatibility only.