rcsmerge(1)

1RCSMERGE(1)                 General Commands Manual                RCSMERGE(1)
2
3
4

NAME

6       rcsmerge - merge RCS revisions
7

SYNOPSIS

9       rcsmerge [options] file
10

DESCRIPTION

12       rcsmerge  incorporates the changes between two revisions of an RCS file
13       into the corresponding working file.
14
15       Filenames matching an RCS suffix denote RCS files;  all  others  denote
16       working files.  Names are paired as explained in ci(1).
17
18       At  least  one  revision  must be specified with one of the options de‐
19       scribed below, usually -r.  At most two revisions may be specified.  If
20       only  one  revision  is  specified,  the latest revision on the default
21       branch (normally the highest branch on the trunk) is  assumed  for  the
22       second  revision.   Revisions  may be specified numerically or symboli‐
23       cally.
24
25       rcsmerge prints a warning if there are overlaps, and delimits the over‐
26       lapping  regions  as  explained in merge(1).  The command is useful for
27       incorporating changes into a checked-out revision.
28

OPTIONS

30       -A     Output conflicts using the -A style of diff3(1), if supported by
31              diff3.  This merges all changes leading from file2 to file3 into
32              file1, and generates the most verbose output.
33
34       -E, -e These options specify conflict styles that generate less  infor‐
35              mation  than  -A.  See diff3(1) for details.  The default is -E.
36              With -e, rcsmerge does not warn about conflicts.
37
38       -ksubst
39              Use subst style keyword substitution.  See  co(1)  for  details.
40              For example, -kk -r1.1 -r1.2 ignores differences in keyword val‐
41              ues when merging the changes from 1.1 to 1.2.  It normally  does
42              not  make  sense  to merge binary files as if they were text, so
43              rcsmerge refuses to merge files if -kb expansion is used.
44
45       -p[rev]
46              Send the result to standard output instead  of  overwriting  the
47              working file.
48
49       -q[rev]
50              Run quietly; do not print diagnostics.
51
52       -r[rev]
53              Merge  with  respect  to revision rev.  Here an empty rev stands
54              for the latest revision on  the  default  branch,  normally  the
55              head.
56
57       -T     This  option has no effect; it is present for compatibility with
58              other RCS commands.
59
60       -V     Print RCS's version number.
61
62       -Vn    Emulate RCS version n.  See co(1) for details.
63
64       -xsuffixes
65              Use suffixes to characterize RCS files.  See ci(1) for details.
66
67       -zzone Use zone as the time zone for keyword substitution.   See  co(1)
68              for details.
69

EXAMPLES

71       Suppose you have released revision 2.8 of f.c.  Assume furthermore that
72       after you complete an unreleased revision 3.4, you receive  updates  to
73       release  2.8 from someone else.  To combine the updates to 2.8 and your
74       changes between 2.8 and 3.4, put the updates to 2.8 into file  f.c  and
75       execute
76
77           rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c
78
79       Then  examine  f.merged.c.   Alternatively, if you want to save the up‐
80       dates to 2.8 in the RCS file, check them in as revision 2.8.1.1 and ex‐
81       ecute co -j:
82
83           ci  -r2.8.1.1  f.c
84           co  -r3.4  -j2.8:2.8.1.1  f.c
85
86       As  another  example,  the following command undoes the changes between
87       revision 2.4 and 2.8 in your currently checked out revision in f.c.
88
89           rcsmerge  -r2.8  -r2.4  f.c
90
91       Note the order of the arguments, and that f.c will be overwritten.
92

ENVIRONMENT

94       RCSINIT
95              Options prepended to the argument list, separated by spaces.   A
96              backslash  escapes spaces within an option.  The RCSINIT options
97              are prepended to the argument lists of most RCS commands.   Use‐
98              ful RCSINIT options include -q, -V, -x, and -z.
99
100       RCS_MEM_LIMIT
101              Normally,  for  speed,  commands  either memory map or copy into
102              memory the RCS file if its size is less than  the  memory-limit,
103              currently  defaulting  to  ``unlimited''.   Otherwise (or if the
104              initially-tried speedy ways fail), the commands fall back to us‐
105              ing  standard  i/o routines.  You can adjust the memory limit by
106              setting RCS_MEM_LIMIT to a numeric value lim (measured in  kilo‐
107              bytes).   An empty value is silently ignored.  As a side effect,
108              specifying RCS_MEM_LIMIT inhibits fall-back to slower routines.
109
110       TMPDIR Name of the temporary directory.  If not  set,  the  environment
111              variables TMP and TEMP are inspected instead and the first value
112              found is taken; if none of them are set,  a  host-dependent  de‐
113              fault is used, typically /tmp.
114

DIAGNOSTICS

116       Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
117

IDENTIFICATION

119       Author: Walter F. Tichy.
120       Manual Page Revision: 5.10.0; Release Date: 2021-07-23.
121       Copyright © 2010-2020 Thien-Thi Nguyen.
122       Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
123       Copyright © 1982, 1988, 1989 Walter F. Tichy.
124