Annotation of src/usr.bin/rcs/rcsmerge.1, Revision 1.12
1.12 ! jmc 1: .\" $OpenBSD: rcsmerge.1,v 1.11 2006/05/08 10:02:02 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
1.12 ! jmc 25: .Op Fl EV
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 k Ns Ar mode
54: Specify the keyword substitution mode.
1.2 xsa 55: .It Fl p Ns Op Ar rev
1.1 xsa 56: Print result to standard output.
1.2 xsa 57: .It Fl q Ns Op Ar rev
1.1 xsa 58: Be quiet about reporting.
59: .It Fl r Ns Ar rev
60: Merge with respect to revision
61: .Ar rev .
1.7 jmc 62: This option should be specified twice to merge changes
63: between two specific revisions.
64: If only one revision is specified,
65: merging is done between that revision and
66: the latest revision of the default branch.
1.1 xsa 67: .It Fl V
68: Print RCS's version number.
69: .It Fl x Ns Ar suffixes
70: Specify the suffixes for RCS files.
71: Suffixes should be separated by the
72: .Sq /
73: character.
74: .It Fl z Ns Ar tz
75: Specify the time zone for keyword substitution.
76: .El
77: .Sh ENVIRONMENT
78: .Bl -tag -width RCSINIT
79: .It Ev RCSINIT
80: If set, this variable should contain a list of space-delimited options that
81: are prepended to the argument list.
82: .El
1.3 xsa 83: .Sh EXAMPLES
84: Merge differences between revision 1.4 and 1.8 of
85: .Pa foo.c
86: and print the result to standard output:
87: .Pp
88: .Dl $ rcsmerge -p -r1.4 -r1.8 foo.c
89: .Pp
90: Undo changes between revision 2.4 and 2.8 of
91: .Pa foo.c ,
92: overwriting the working copy:
93: .Pp
94: .Dl $ rcsmerge -r2.8 -r2.4 foo.c
1.11 xsa 95: .Sh DIAGNOSTICS
96: The
97: .Nm
98: utility exits with one of the following values:
99: .Pp
100: .Bl -tag -width Ds -compact -offset indent
101: .It 0
102: No overlaps.
103: .It 1
104: Overlaps were found.
105: .It 2
106: An error occurred.
107: .El
1.1 xsa 108: .Sh SEE ALSO
109: .Xr ci 1 ,
110: .Xr co 1 ,
111: .Xr ident 1 ,
112: .Xr rcs 1 ,
113: .Xr rcsclean 1 ,
114: .Xr rcsdiff 1 ,
115: .Xr rlog 1
1.5 jmc 116: .Sh STANDARDS
1.8 jmc 117: The flags
1.12 ! jmc 118: .Op Fl AeT
1.8 jmc 119: have no effect and are provided
1.5 jmc 120: for compatibility only.